Fixed NullReferenceExceptions if in the netlobby when a round ends, fixed chatmsgbox staying disabled after being stunned

2016-08-16 20:18:19 +03:00
parent 6c5452570e
commit 26b6847bca
3 changed files with 8 additions and 6 deletions
@@ -200,6 +200,8 @@ namespace Barotrauma
                GameMain.NetworkMember = null;
            }

+            GameMain.GameSession = null;
+
            GameMain.MainMenuScreen.Select();
            //Game1.MainMenuScreen.SelectTab(null, (int)MainMenuScreen.Tabs.Main);

@@ -335,7 +335,7 @@ namespace Barotrauma.Networking
            if (gameStarted && Screen.Selected == GameMain.GameScreen)
            {
                chatMsgBox.Visible = Character.Controlled == null || 
-                    (!Character.Controlled.IsUnconscious && Character.Controlled.Stun >= 0.0f);
+                    (!Character.Controlled.IsUnconscious && Character.Controlled.Stun <= 0.0f);

                inGameHUD.Update(deltaTime);