From 3b25043d117b7a9c62d52873ff010eb8370badf2 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:10:32 -0700 Subject: [PATCH] OnChestItem now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index ad079ebe..3f3c5470 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -926,10 +926,8 @@ namespace TShockAPI /// /// For use in a ChestItemChange event /// - public class ChestItemEventArgs : HandledEventArgs + public class ChestItemEventArgs : GetDataHandledEventArgs { - /// The TSPlayer that triggered the event. - public TSPlayer Player { get; set; } /// /// ChestID /// @@ -956,7 +954,7 @@ namespace TShockAPI /// public static HandlerList ChestItemChange = new HandlerList(); - private static bool OnChestItemChange(TSPlayer player, short id, byte slot, short stacks, byte prefix, short type) + private static bool OnChestItemChange(TSPlayer player, MemoryStream data, short id, byte slot, short stacks, byte prefix, short type) { if (ChestItemChange == null) return false; @@ -964,6 +962,7 @@ namespace TShockAPI var args = new ChestItemEventArgs { Player = player, + Data = data, ID = id, Slot = slot, Stacks = stacks, @@ -2582,7 +2581,7 @@ namespace TShockAPI var prefix = args.Data.ReadInt8(); var type = args.Data.ReadInt16(); - if (OnChestItemChange(args.Player, id, slot, stacks, prefix, type)) + if (OnChestItemChange(args.Player, args.Data, id, slot, stacks, prefix, type)) return true; Item item = new Item();