themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

OnItemDrop now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:22:29 -07:00
parent 5d4a4f7067
commit d0efdc3939
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TShockAPI/GetDataHandlers.cs
View file

@ -1101,12 +1101,8 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in an ItemDrop event /// For use in an ItemDrop event
/// </summary> /// </summary>
public class ItemDropEventArgs : HandledEventArgs public class ItemDropEventArgs : GetDataHandledEventArgs
{ {
/// <summary>
/// The player who sent message
/// </summary>
public TSPlayer Player { get; set; }
/// <summary> /// <summary>
/// ID of the item. /// ID of the item.
/// If below 400 and NetID(Type) is 0 Then Set Null. If ItemID is 400 Then New 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
/// </summary> /// </summary>
public static HandlerList<ItemDropEventArgs> ItemDrop = new HandlerList<ItemDropEventArgs>(); public static HandlerList<ItemDropEventArgs> ItemDrop = new HandlerList<ItemDropEventArgs>();
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) if (ItemDrop == null)
return false; return false;
@ -1150,6 +1146,7 @@ namespace TShockAPI
var args = new ItemDropEventArgs var args = new ItemDropEventArgs
{ {
Player = player, Player = player,
Data = data,
ID = id, ID = id,
Position = pos, Position = pos,
Velocity = vel, Velocity = vel,
@ -2662,7 +2659,7 @@ namespace TShockAPI
var noDelay = args.Data.ReadInt8() == 1; var noDelay = args.Data.ReadInt8() == 1;
var type = args.Data.ReadInt16(); 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 true;
return false; return false;