diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 54715e9b..8a0081b2 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1162,9 +1162,8 @@ namespace TShockAPI /// /// For use in a PlayerDamage event /// - public class PlayerDamageEventArgs : HandledEventArgs + public class PlayerDamageEventArgs : GetDataHandledEventArgs { - public TSPlayer Player { get; set; } /// /// The Terraria playerID of the player /// @@ -1193,7 +1192,7 @@ namespace TShockAPI /// public static HandlerList PlayerDamage = new HandlerList(); - private static bool OnPlayerDamage(TSPlayer player, byte id, byte dir, short dmg, bool pvp, bool crit, PlayerDeathReason playerDeathReason) + private static bool OnPlayerDamage(TSPlayer player, MemoryStream data, byte id, byte dir, short dmg, bool pvp, bool crit, PlayerDeathReason playerDeathReason) { if (PlayerDamage == null) return false; @@ -1201,6 +1200,7 @@ namespace TShockAPI var args = new PlayerDamageEventArgs { Player = player, + Data = data, ID = id, Direction = dir, Damage = dmg, @@ -2692,7 +2692,7 @@ namespace TShockAPI var crit = bits[0]; var pvp = bits[1]; - if (OnPlayerDamage(args.Player, id, direction, dmg, pvp, crit, playerDeathReason)) + if (OnPlayerDamage(args.Player, args.Data, id, direction, dmg, pvp, crit, playerDeathReason)) return true; if (TShock.Players[id].GodMode)