From 5d4a4f706782950e3f3dab4dfb503a46f38be9b6 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:21:36 -0700 Subject: [PATCH] OnPlayerBuff now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 628fa4e4..0ab947fd 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1061,9 +1061,8 @@ namespace TShockAPI /// /// For use in a PlayerBuff event /// - public class PlayerBuffEventArgs : HandledEventArgs + public class PlayerBuffEventArgs : GetDataHandledEventArgs { - public TSPlayer Player { get; set; } /// /// The Terraria playerID of the player /// @@ -1082,7 +1081,7 @@ namespace TShockAPI /// public static HandlerList PlayerBuff = new HandlerList(); - private static bool OnPlayerBuff(TSPlayer player, byte id, byte type, int time) + private static bool OnPlayerBuff(TSPlayer player, MemoryStream data, byte id, byte type, int time) { if (PlayerBuff == null) return false; @@ -1090,6 +1089,7 @@ namespace TShockAPI var args = new PlayerBuffEventArgs { Player = player, + Data = data, ID = id, Type = type, Time = time @@ -2645,7 +2645,7 @@ namespace TShockAPI var type = args.Data.ReadInt8(); var time = args.Data.ReadInt32(); - if (OnPlayerBuff(args.Player, id, type, time)) + if (OnPlayerBuff(args.Player, args.Data, id, type, time)) return true; args.Player.SendData(PacketTypes.PlayerAddBuff, "", id);