From 0c68c0510d2bde165619e640604080d79b2e568f Mon Sep 17 00:00:00 2001 From: Blackgamerz <105124395+BlackgamerzVN@users.noreply.github.com> Date: Wed, 4 Mar 2026 12:45:38 +0700 Subject: [PATCH 1/3] Update GameLobbyBase.cs --- .../DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs index 9e0bf0685..7d7090f47 100644 --- a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs +++ b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs @@ -2571,11 +2571,10 @@ protected virtual void ChangeMap(GameModeMap gameModeMap) } else { - if (PlayerOptionsPanel != null) - { - PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = true; - PlayerExtraOptionsPanel.UseTeamStartMappingsAllowChecking = true; - } + if (PlayerOptionsPanel == null) return; + if (PlayerExtraOptionsPanel == null) return; + PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = true; + PlayerExtraOptionsPanel.UseTeamStartMappingsAllowChecking = true; } OnGameOptionChanged(); From 89c04ca6ac8ca84e5b25cd8acf7db59d6b86f323 Mon Sep 17 00:00:00 2001 From: SadPencil Date: Wed, 4 Mar 2026 14:10:12 +0800 Subject: [PATCH 2/3] Revert "Update GameLobbyBase.cs" This reverts commit 0c68c0510d2bde165619e640604080d79b2e568f. --- .../DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs index 7d7090f47..9e0bf0685 100644 --- a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs +++ b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs @@ -2571,10 +2571,11 @@ protected virtual void ChangeMap(GameModeMap gameModeMap) } else { - if (PlayerOptionsPanel == null) return; - if (PlayerExtraOptionsPanel == null) return; - PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = true; - PlayerExtraOptionsPanel.UseTeamStartMappingsAllowChecking = true; + if (PlayerOptionsPanel != null) + { + PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = true; + PlayerExtraOptionsPanel.UseTeamStartMappingsAllowChecking = true; + } } OnGameOptionChanged(); From 6288d641d55da0f71749d65c3c7d2d41cff9fbad Mon Sep 17 00:00:00 2001 From: SadPencil Date: Wed, 4 Mar 2026 14:10:29 +0800 Subject: [PATCH 3/3] Update GameLobbyBase.cs --- DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs index 9e0bf0685..89a9f24dd 100644 --- a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs +++ b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs @@ -2560,7 +2560,7 @@ protected virtual void ChangeMap(GameModeMap gameModeMap) foreach (PlayerInfo pInfo in concatPlayerList) pInfo.TeamId = 1; - if (PlayerOptionsPanel != null) + if (PlayerExtraOptionsPanel != null) { PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = false; PlayerExtraOptionsPanel.ForcedNoTeams = false; @@ -2571,7 +2571,7 @@ protected virtual void ChangeMap(GameModeMap gameModeMap) } else { - if (PlayerOptionsPanel != null) + if (PlayerExtraOptionsPanel != null) { PlayerExtraOptionsPanel.ForcedNoTeamsAllowChecking = true; PlayerExtraOptionsPanel.UseTeamStartMappingsAllowChecking = true;