diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 0ab947fd..54715e9b 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1101,12 +1101,8 @@ namespace TShockAPI /// /// For use in an ItemDrop event /// - public class ItemDropEventArgs : HandledEventArgs + public class ItemDropEventArgs : GetDataHandledEventArgs { - /// - /// The player who sent message - /// - public TSPlayer Player { get; set; } /// /// ID of the item. /// If below 400 and NetID(Type) is 0 Then Set Null. If ItemID is 400 Then New Item @@ -1142,7 +1138,7 @@ namespace TShockAPI /// public static HandlerList ItemDrop = new HandlerList(); - private static bool OnItemDrop(TSPlayer player, short id, Vector2 pos, Vector2 vel, short stacks, byte prefix, bool noDelay, short type) + private static bool OnItemDrop(TSPlayer player, MemoryStream data, short id, Vector2 pos, Vector2 vel, short stacks, byte prefix, bool noDelay, short type) { if (ItemDrop == null) return false; @@ -1150,6 +1146,7 @@ namespace TShockAPI var args = new ItemDropEventArgs { Player = player, + Data = data, ID = id, Position = pos, Velocity = vel, @@ -2662,7 +2659,7 @@ namespace TShockAPI var noDelay = args.Data.ReadInt8() == 1; var type = args.Data.ReadInt16(); - if (OnItemDrop(args.Player, id, pos, vel, stacks, prefix, noDelay, type)) + if (OnItemDrop(args.Player, args.Data, id, pos, vel, stacks, prefix, noDelay, type)) return true; return false;