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

OnChestItem now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:10:32 -07:00
parent 1d0d4750e2
commit 3b25043d11
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/GetDataHandlers.cs
View file

@ -926,10 +926,8 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a ChestItemChange event /// For use in a ChestItemChange event
/// </summary> /// </summary>
public class ChestItemEventArgs : HandledEventArgs public class ChestItemEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that triggered the event.</summary>
public TSPlayer Player { get; set; }
/// <summary> /// <summary>
/// ChestID /// ChestID
/// </summary> /// </summary>
@ -956,7 +954,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<ChestItemEventArgs> ChestItemChange = new HandlerList<ChestItemEventArgs>(); public static HandlerList<ChestItemEventArgs> ChestItemChange = new HandlerList<ChestItemEventArgs>();
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) if (ChestItemChange == null)
return false; return false;
@ -964,6 +962,7 @@ namespace TShockAPI
var args = new ChestItemEventArgs var args = new ChestItemEventArgs
{ {
Player = player, Player = player,
Data = data,
ID = id, ID = id,
Slot = slot, Slot = slot,
Stacks = stacks, Stacks = stacks,
@ -2582,7 +2581,7 @@ namespace TShockAPI
var prefix = args.Data.ReadInt8(); var prefix = args.Data.ReadInt8();
var type = args.Data.ReadInt16(); 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; return true;
Item item = new Item(); Item item = new Item();