From 1d0d4750e227c0094bc67d6ff988272c6b283f11 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:09:43 -0700 Subject: [PATCH] OnChestOpen now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index a3ac79ae..ad079ebe 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -891,7 +891,7 @@ namespace TShockAPI /// /// For use with a ChestOpen event /// - public class ChestOpenEventArgs : HandledEventArgs + public class ChestOpenEventArgs : GetDataHandledEventArgs { /// /// X location of said chest @@ -901,24 +901,20 @@ namespace TShockAPI /// Y location of said chest /// public int Y { get; set; } - - /// - /// The player opening the chest - /// - public TSPlayer Player { get; set; } } /// /// ChestOpen - Called when any chest is opened /// public static HandlerList ChestOpen = new HandlerList(); - private static bool OnChestOpen(int x, int y, TSPlayer player) + private static bool OnChestOpen(MemoryStream data, int x, int y, TSPlayer player) { if (ChestOpen == null) return false; var args = new ChestOpenEventArgs { + Data = data, X = x, Y = y, Player = player, @@ -2547,7 +2543,7 @@ namespace TShockAPI var x = args.Data.ReadInt16(); var y = args.Data.ReadInt16(); - if (OnChestOpen(x, y, args.Player)) + if (OnChestOpen(args.Data, x, y, args.Player)) return true; return false;