improved battle password handling, fix #1550

ZeroK-RTS · Mar 6, 2017 · 2c7997c · 2c7997c
1 parent 2a31c5a
commit 2c7997c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Shared/LobbyClient/Battle.cs b/Shared/LobbyClient/Battle.cs
@@ -91,7 +91,7 @@ public virtual BattleHeader GetHeader()
                 SpectatorCount = b.SpectatorCount,
                 PlayerCount = b.NonSpectatorCount,
                 MaxPlayers = b.MaxPlayers,
-                Password = b.Password != null ? "?" : null,
+                Password = !string.IsNullOrEmpty(b.Password) ? "?" : "",
                 Mode = b.Mode,
                 IsRunning = b.IsInGame,
                 RunningSince = b.IsInGame ? b.RunningSince : null,

diff --git a/ZkLobbyServer/autohost/Commands/CmdPassword.cs b/ZkLobbyServer/autohost/Commands/CmdPassword.cs
@@ -25,7 +25,7 @@ public override string Arm(ServerBattle battle, Say e, string arguments = null)
         public override async Task ExecuteArmed(ServerBattle battle, Say e)
         {
             await battle.SwitchPassword(pwd);
-            await battle.SayBattle("battle room password changed");
+            await battle.SayBattle(string.IsNullOrEmpty(pwd) ? "battle password removed" : "battle room password changed");
         }
     }
 }