Fixed endless messagebox spam when the controlled character turns into a husk, fixed an index our of range exception when merging firesources

2017-07-09 16:17:44 +03:00
parent 2598bb1bd3
commit bd4c7d68d0
3 changed files with 5 additions and 7 deletions
@@ -20,9 +20,9 @@ namespace Barotrauma
                    new GUIMessageBox("", InfoTextManager.GetInfoText("HuskCantSpeak"));
                }
            }
-            else
+            else if (state != InfectionState.Active && Character.Controlled == character)
            {
-                if (Character.Controlled == character) new GUIMessageBox("", InfoTextManager.GetInfoText("HuskActivate"));
+                new GUIMessageBox("", InfoTextManager.GetInfoText("HuskActivate"));
            }
        }
    }