diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 4d331c70..50f16d4e 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -921,7 +921,12 @@ namespace TShockAPI public class ItemDropEventArgs : HandledEventArgs { /// - /// The Terraria playerID of the player + /// 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 /// public short ID { get; set; } /// @@ -954,13 +959,14 @@ namespace TShockAPI /// public static HandlerList ItemDrop; - private static bool OnItemDrop(short id, Vector2 pos, Vector2 vel, short stacks, byte prefix, bool noDelay, short type) + private static bool OnItemDrop(TSPlayer player, short id, Vector2 pos, Vector2 vel, short stacks, byte prefix, bool noDelay, short type) { if (ItemDrop == null) return false; var args = new ItemDropEventArgs { + Player = player, ID = id, Position = pos, Velocity = vel, @@ -3456,7 +3462,7 @@ namespace TShockAPI var noDelay = args.Data.ReadInt8() == 1; var type = args.Data.ReadInt16(); - if (OnItemDrop(id, pos, vel, stacks, prefix, noDelay, type)) + if (OnItemDrop(args.Player, id, pos, vel, stacks, prefix, noDelay, type)) return true; // player is attempting to crash clients