Merge branch 'master' into new-netcode

2017-01-25 20:30:26 +02:00
parent e27fa1c7ee 282c2b75d4
commit 15b3dd31a8
17 changed files with 966 additions and 136 deletions
@@ -397,8 +397,13 @@ namespace Barotrauma
                
                if (value <= 0.0f)
                {
-                    if (huskInfection != null && huskInfection.State == HuskInfection.InfectionState.Active) return; 
-                    huskInfection = null;
+                    if (huskInfection != null)
+                    {
+                        //already active, can't cure anymore
+                        if (huskInfection.State == HuskInfection.InfectionState.Active) return;
+                        huskInfection.Remove(this);
+                        huskInfection = null;
+                    }
                }
                else
                {
@@ -143,6 +143,12 @@ namespace Barotrauma
            character.AnimController.AddJoint(jointElement);
        }

+        public void Remove(Character character)
+        {
+            if (character != null)
+                character.OnDeath -= CharacterDead;
+        }
+
        private void CharacterDead(Character character, CauseOfDeath causeOfDeath)
        {
            var husk = Character.Create(