From e9931e8740d660bccac08e8e1659074d87277dfb Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:22:45 -0700 Subject: [PATCH] OnPlayerInfo now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 7e7324b5..f38de154 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -324,7 +324,7 @@ namespace TShockAPI return args.Handled; } - public class PlayerInfoEventArgs : HandledEventArgs + public class PlayerInfoEventArgs : GetDataHandledEventArgs { /// /// The Terraria playerID of the player @@ -353,13 +353,15 @@ namespace TShockAPI /// public static HandlerList PlayerInfo = new HandlerList(); - private static bool OnPlayerInfo(byte _plrid, byte _hair, int _style, byte _difficulty, string _name) + private static bool OnPlayerInfo(TSPlayer player, MemoryStream data, byte _plrid, byte _hair, int _style, byte _difficulty, string _name) { if (PlayerInfo == null) return false; var args = new PlayerInfoEventArgs { + Player = player, + Data = data, PlayerId = _plrid, Hair = _hair, Style = _style, @@ -1730,7 +1732,7 @@ namespace TShockAPI bool extraSlot = extra[2]; - if (OnPlayerInfo(playerid, hair, skinVariant, difficulty, name)) + if (OnPlayerInfo(args.Player, args.Data, playerid, hair, skinVariant, difficulty, name)) { TShock.Utils.ForceKick(args.Player, "A plugin cancelled the event.", true); return true;