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

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

Browse Source 
characterDeath with killer and killing affliction
This commit is contained in:
Evil Factory
2021-08-29 15:42:01 -03:00
committed by GitHub
parent e24797dd05 67dd27f4fe
commit dd5ea6e4f8
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace Barotrauma
GameServer.Log(GameServer.CharacterLogName(this) + " has died (Cause of death: " + causeOfDeath + ")", ServerLog.MessageType.Attack); 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; healthUpdateTimer = 0.0f;
if (CauseOfDeath.Killer != null && CauseOfDeath.Killer.IsTraitor && CauseOfDeath.Killer != this) if (CauseOfDeath.Killer != null && CauseOfDeath.Killer.IsTraitor && CauseOfDeath.Killer != this)
Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
-4
View File
@@ -3808,10 +3808,6 @@ namespace Barotrauma
GameMain.GameSession.KillCharacter(this); GameMain.GameSession.KillCharacter(this);
} }
#if SERVER
GameMain.Lua.hook.Call("characterDeath", new object[] { this });
#endif
} }
partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log); partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction, bool log);