Merge pull request #11 from mc-oofert/patch-1

characterDeath with killer and killing affliction
This commit is contained in:
Evil Factory
2021-08-29 15:42:01 -03:00
committed by GitHub
2 changed files with 1 additions and 5 deletions

View File

@@ -27,7 +27,7 @@ namespace Barotrauma
GameServer.Log(GameServer.CharacterLogName(this) + " has died (Cause of death: " + causeOfDeath + ")", ServerLog.MessageType.Attack);
}
}
GameMain.Lua.hook.Call("characterDeath", new object[] { this,causeOfDeathAffliction });
healthUpdateTimer = 0.0f;
if (CauseOfDeath.Killer != null && CauseOfDeath.Killer.IsTraitor && CauseOfDeath.Killer != this)

View File

@@ -3808,10 +3808,6 @@ namespace Barotrauma
GameMain.GameSession.KillCharacter(this);
}
#if SERVER
GameMain.Lua.hook.Call("characterDeath", new object[] { this });
#endif
}
partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log);