Remove the failsafe design in HumanPlayersOnly (#711)

SadPencil · web-flow · commit 18a3f11e8c9d · 2025-05-11T22:35:50.000+08:00
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyBase.cs
@@ -2236,8 +2236,7 @@ protected virtual void ChangeMap(GameModeMap gameModeMap)
 
 
             // Check if AI players allowed
-            bool AIAllowed = !(Map.MultiplayerOnly || GameMode.MultiplayerOnly) ||
-                             !(Map.HumanPlayersOnly || GameMode.HumanPlayersOnly);
+            bool AIAllowed = !(Map.HumanPlayersOnly || GameMode.HumanPlayersOnly);
             foreach (var ddName in ddPlayerNames)
             {
                 if (ddName.Items.Count > 3)
diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/SkirmishLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/SkirmishLobby.cs
@@ -366,7 +366,7 @@ private void LoadSettings()
                 //return;
             }
 
-            bool AIAllowed = !(Map.MultiplayerOnly || GameMode.MultiplayerOnly) || !(Map.HumanPlayersOnly || GameMode.HumanPlayersOnly);
+            bool AIAllowed = !(Map.HumanPlayersOnly || GameMode.HumanPlayersOnly);
             foreach (string key in keys)
             {
                 if (!AIAllowed) break;

Original file line number	Diff line number	Diff line change
`@@ -2236,8 +2236,7 @@ protected virtual void ChangeMap(GameModeMap gameModeMap)`
`2236`	`2236`
`2237`	`2237`
`2238`	`2238`	`// Check if AI players allowed`
`2239`		`- bool AIAllowed = !(Map.MultiplayerOnly \|\| GameMode.MultiplayerOnly) \|\|`
`2240`		`- !(Map.HumanPlayersOnly \|\| GameMode.HumanPlayersOnly);`
	`2239`	`+ bool AIAllowed = !(Map.HumanPlayersOnly \|\| GameMode.HumanPlayersOnly);`
`2241`	`2240`	`foreach (var ddName in ddPlayerNames)`
`2242`	`2241`	`{`
`2243`	`2242`	`if (ddName.Items.Count > 3)`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ private void LoadSettings()`
`366`	`366`	`//return;`
`367`	`367`	`}`
`368`	`368`
`369`		`- bool AIAllowed = !(Map.MultiplayerOnly \|\| GameMode.MultiplayerOnly) \|\| !(Map.HumanPlayersOnly \|\| GameMode.HumanPlayersOnly);`
	`369`	`+ bool AIAllowed = !(Map.HumanPlayersOnly \|\| GameMode.HumanPlayersOnly);`
`370`	`370`	`foreach (string key in keys)`
`371`	`371`	`{`
`372`	`372`	`if (!AIAllowed) break;`