(d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-29 21:08:16 +03:00
parent b3b1d1851d
commit c5452048d7
20 changed files with 66 additions and 58 deletions
@@ -46,8 +46,7 @@ namespace Barotrauma
                if (controlled == value) return;
                controlled = value;
                if (controlled != null) controlled.Enabled = true;
-                CharacterHealth.OpenHealthWindow = null;
-                
+                CharacterHealth.OpenHealthWindow = null;                
            }
        }