vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HuskInfection unsubscribes from the OnDeath event when the infection is cured (-> cured characters don't turn into husks when they die)

Browse Source
This commit is contained in:
Regalis
2017-01-07 14:45:17 +02:00
parent a5f0d1d7da
commit 629df6aab3
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+7 -2
View File
@@ -336,8 +336,13 @@ namespace Barotrauma
if (value <= 0.0f) if (value <= 0.0f)
{ {
if (huskInfection != null && huskInfection.State == HuskInfection.InfectionState.Active) return; if (huskInfection != null)
huskInfection = null; {
//already active, can't cure anymore
if (huskInfection.State == HuskInfection.InfectionState.Active) return;
huskInfection.Remove(this);
huskInfection = null;
}
} }
else else
{ {
Subsurface/Source/Characters/HuskInfection.cs
+6
View File
@@ -143,6 +143,12 @@ namespace Barotrauma
character.AnimController.AddJoint(jointElement); character.AnimController.AddJoint(jointElement);
} }
public void Remove(Character character)
{
if (character != null)
character.OnDeath -= CharacterDead;
}
private void CharacterDead(Character character, CauseOfDeath causeOfDeath) private void CharacterDead(Character character, CauseOfDeath causeOfDeath)
{ {
var husk = Character.Create( var husk = Character.Create(