From f0a6ad54a2e643837a21e5d95ea330000b834403 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:31:39 -0700 Subject: [PATCH] OnHealOtherPlayer now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index b2f08e89..560442ed 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -605,11 +605,8 @@ namespace TShockAPI } /// The event args object for the HealOtherPlayer event - public class HealOtherPlayerEventArgs : HandledEventArgs + public class HealOtherPlayerEventArgs : GetDataHandledEventArgs { - /// The TSPlayer object that caused the event - public TSPlayer Player { get; set; } - /// The Terraria player index of the target player public byte TargetPlayerIndex { get; set; } @@ -621,11 +618,10 @@ namespace TShockAPI public static HandlerList HealOtherPlayer = new HandlerList(); /// Fires the HealOtherPlayer event - /// The TSPlayer that started the event /// The Terraria player index that the event targets /// The amount to heal /// bool - private static bool OnHealOtherPlayer(TSPlayer player, byte targetPlayerIndex, short amount) + private static bool OnHealOtherPlayer(TSPlayer player, MemoryStream data, byte targetPlayerIndex, short amount) { if (HealOtherPlayer == null) return false; @@ -633,6 +629,7 @@ namespace TShockAPI var args = new HealOtherPlayerEventArgs { Player = player, + Data = data, TargetPlayerIndex = targetPlayerIndex, Amount = amount, }; @@ -1586,7 +1583,7 @@ namespace TShockAPI byte plr = args.Data.ReadInt8(); short amount = args.Data.ReadInt16(); - if (OnHealOtherPlayer(args.Player, plr, amount)) + if (OnHealOtherPlayer(args.Player, args.Data, plr, amount)) return true; return false;