From 0543e0b18fb7262bbb809784256fe9f3b00651db Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:27:01 -0700 Subject: [PATCH] OnGemLockToggle now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index dfa26294..41334bcc 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3170,10 +3170,8 @@ namespace TShockAPI /// /// For use with a ToggleGemLock event /// - public class GemLockToggleEventArgs : HandledEventArgs + public class GemLockToggleEventArgs : GetDataHandledEventArgs { - /// The TSPlayer that triggered the event. - public TSPlayer Player { get; set; } /// /// X Location /// @@ -3193,13 +3191,15 @@ namespace TShockAPI /// public static HandlerList GemLockToggle = new HandlerList(); - private static bool OnGemLockToggle(short x, short y, bool on) + private static bool OnGemLockToggle(TSPlayer player, MemoryStream data, short x, short y, bool on) { if (GemLockToggle == null) return false; var args = new GemLockToggleEventArgs { + Player = player, + Data = data, X = x, Y = y, On = on @@ -3214,7 +3214,7 @@ namespace TShockAPI var y = args.Data.ReadInt16(); var on = args.Data.ReadBoolean(); - if (OnGemLockToggle(x, y, on)) + if (OnGemLockToggle(args.Player, args.Data, x, y, on)) { return true; }