diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index c37566e7..e20be739 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -207,7 +207,7 @@ namespace TShockAPI /// /// For use in a PlayerSlot event /// - public class PlayerSlotEventArgs : HandledEventArgs + public class PlayerSlotEventArgs : GetDataHandledEventArgs { /// /// The Terraria playerID @@ -234,13 +234,15 @@ namespace TShockAPI /// PlayerSlot - called at a PlayerSlot event /// public static HandlerList PlayerSlot = new HandlerList(); - private static bool OnPlayerSlot(byte _plr, byte _slot, short _stack, byte _prefix, short _type) + private static bool OnPlayerSlot(TSPlayer player, MemoryStream data, byte _plr, byte _slot, short _stack, byte _prefix, short _type) { if (PlayerSlot == null) return false; var args = new PlayerSlotEventArgs { + Player = player, + Data = data, PlayerId = _plr, Slot = _slot, Stack = _stack, @@ -1603,7 +1605,7 @@ namespace TShockAPI bypassTrashCanCheck = true; } - if (OnPlayerSlot(plr, slot, stack, prefix, type) || plr != args.Player.Index || slot < 0 || + if (OnPlayerSlot(args.Player, args.Data, plr, slot, stack, prefix, type) || plr != args.Player.Index || slot < 0 || slot > NetItem.MaxInventory) return true; if (args.Player.IgnoreSSCPackets)