diff --git a/DeathLog/DeathLog.csproj b/DeathLog/DeathLog.csproj index 6098da8..69364ba 100644 --- a/DeathLog/DeathLog.csproj +++ b/DeathLog/DeathLog.csproj @@ -62,8 +62,8 @@ $(NW-ASSEMBLIES)\Mirror.Components.dll - - $(NW-ASSEMBLIES)\PluginAPI.dll + + ..\packages\Northwood.PluginAPI.13.1.0\lib\net48\PluginAPI.dll $(NW-ASSEMBLIES)\Pooling.dll diff --git a/DeathLog/DeathLogPlugin.cs b/DeathLog/DeathLogPlugin.cs index 8b8c015..ea76ed7 100644 --- a/DeathLog/DeathLogPlugin.cs +++ b/DeathLog/DeathLogPlugin.cs @@ -46,8 +46,11 @@ public sealed class DeathLogPlugin handler is UniversalDamageHandler udh && (udh.TranslationId == 0 ? string.IsNullOrEmpty(udh._logsText) : udh._logsText == DeathTranslations.Unknown.LogLabel); [PluginEvent(ServerEventType.PlayerDying)] - private void OnPlayerDeath(Player player, Player attacker, DamageHandlerBase handler) + private void OnPlayerDeath(PlayerDyingEvent e) { + var player = e.Player; + var attacker = e.Attacker; + var handler = e.DamageHandler; if (player.Role is RoleTypeId.None or RoleTypeId.Scp0492 || string.IsNullOrEmpty(player.ReferenceHub.nicknameSync._myNickSync)) return; if (attacker != null && handler is AttackerDamageHandler adh) @@ -61,9 +64,14 @@ public sealed class DeathLogPlugin } [PluginEvent(ServerEventType.PlayerDamage)] - private void OnDamage(Player player, Player attacker, DamageHandlerBase handler) + private void OnDamage(PlayerDamageEvent e) { - if (!IsUnknownCause(handler) || player.ReferenceHub.roleManager.CurrentRole is not FpcStandardScp {RoleTypeId: not RoleTypeId.Scp0492}) + var handler = e.DamageHandler; + var player = e.Player; + if (player == null + || !player.IsConnected() + || !IsUnknownCause(handler) + || player.ReferenceHub.roleManager.CurrentRole is not FpcStandardScp {RoleTypeId: not RoleTypeId.Scp0492}) return; var stats = player.ReferenceHub.playerStats; _lastHealth = stats.GetModule().CurValue; diff --git a/DeathLog/packages.config b/DeathLog/packages.config index c9255c3..37f17d8 100644 --- a/DeathLog/packages.config +++ b/DeathLog/packages.config @@ -4,6 +4,7 @@ developmentDependency="true"/> +