(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)

2019-04-01 22:47:22 +03:00
parent ec7e23061b
commit 2eaf22683d
129 changed files with 2451 additions and 1336 deletions
@@ -130,7 +130,12 @@ namespace Barotrauma
                {
                    OnEnterMessage = (textbox, text) =>
                    {
-                        if (Character.Controlled == null) { return true; }
+                        if (Character.Controlled?.Info == null)
+                        {
+                            textbox.Deselect();
+                            textbox.Text = "";
+                            return true;
+                        }

                        textbox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Default];

@@ -976,7 +981,7 @@ namespace Barotrauma
                foreach (GUIComponent c in prevCharacterListBox.Content.Children)
                {
                    Character character = c.UserData as Character;
-                    if (character == null) continue;
+                    if (character == null || character.IsDead || character.Removed) continue;
                    AddCharacter(character);
                    DisplayCharacterOrder(character, character.CurrentOrder);
                }