Changeset 28148 for ps/trunk/binaries/data/mods

Timestamp:

Jul 10, 2024, 8:20:51 AM (2 weeks ago)

Author:

Dunedan

Message:

Instantiate controller only for the host

This moves the check whether a player is the host out of
LobbyGameRegistrationController and only creates an instance of it in
SetupWindow if the player is the host.

This solves a problem with
LobbyGameRegistrationController.onGameStart() getting triggered by
players not being the host and sending unnecessary and invalid
changestate stanzas to XpartaMuPP.

Patch by: @Dunedan
Accepted by: @Stan

Differential Revision: ​https://code.wildfiregames.com/D5270

Location:

ps/trunk/binaries/data/mods/public/gui/gamesetup

Files:

• Controllers/LobbyGameRegistration.js (modified) (3 diffs)
• SetupWindow.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/gui/gamesetup/Controllers/LobbyGameRegistration.js

@@ -47 +47 @@
     onClosePage()
     {
-        if (g_IsController && Engine.HasXmppClient())
-            Engine.SendUnregisterGame();
+        Engine.SendUnregisterGame();
     }
 
@@ -56 +55 @@
     sendDelayed()
     {
-        if (!g_IsController || !Engine.HasXmppClient())
-            return;
-
         // Already sending an update - do nothing.
         if (this.timer !== undefined)
@@ -71 +67 @@
     sendImmediately()
     {
-        if (!g_IsController || !Engine.HasXmppClient())
-            return;
-
         // Wait until a map has been selected.
         if (!g_GameSettings.map.map)

ps/trunk/binaries/data/mods/public/gui/gamesetup/SetupWindow.js

@@ -34 +34 @@
         let gameSettingsController = new GameSettingsController(this, netMessages, playerAssignmentsController, mapCache);
         let readyController = new ReadyController(netMessages, gameSettingsController, playerAssignmentsController);
-        let lobbyGameRegistrationController = Engine.HasXmppClient() &&
+         Engine.HasXmppClient() &&
             new LobbyGameRegistrationController(initData, this, netMessages, mapCache, playerAssignmentsController);