File tree 1 file changed +4
-4
lines changed
1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,6 @@ var _trackPlayer = null;
26
26
var playerCount = 0 ;
27
27
var _overlays = [ ] ;
28
28
var _disabledBlips = [ ] ;
29
-
30
29
window . changeServer = function ( nameOfServer ) {
31
30
console . log ( "Changing connected server to: " + nameOfServer ) ;
32
31
if ( ! ( nameOfServer in config . servers ) ) {
@@ -38,7 +37,6 @@ window.changeServer = function (nameOfServer) {
38
37
}
39
38
40
39
window . connectedTo = config . servers [ nameOfServer ] ;
41
- //window.connectedTo = Object.assign(config.defaults, connectedTo);
42
40
43
41
window . connectedTo . getBlipUrl = function ( ) {
44
42
if ( this . reverseProxy && this . reverseProxy . blips ) {
@@ -83,10 +81,12 @@ function globalInit() {
83
81
84
82
for ( const serverName in config . servers ) {
85
83
// Make sure all servers inherit defaults if they need
86
- config . servers [ serverName ] = Object . assign ( config . servers [ serverName ] , config . defaults ) ;
84
+ var o = Object . assign ( { } , config . defaults , config . servers [ serverName ] ) ;
85
+ if ( config . debug ) console . log ( o ) ;
86
+ config . servers [ serverName ] = o ;
87
87
}
88
88
89
- changeServer ( Object . keys ( p . servers ) [ 0 ] ) ;
89
+ changeServer ( Object . keys ( p . servers ) [ 0 ] ) ; // Show the stuff for the first server in the config.
90
90
91
91
initMarkers ( ) ;
92
92
initPage ( ) ;
You can’t perform that action at this time.
0 commit comments