From 16654cafc42dc05deeec2fa31765c3580e30d1ec Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:27:00 -0700 Subject: [PATCH] OnMassWireOperation now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index f457af5d..7c1c64d5 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1263,11 +1263,8 @@ namespace TShockAPI } /// The arguments to the MassWireOperation event. - public class MassWireOperationEventArgs : HandledEventArgs + public class MassWireOperationEventArgs : GetDataHandledEventArgs { - /// The TSPlayer that triggered the event. - public TSPlayer Player { get; set; } - /// The start X point in the operation. public short StartX { get; set; } @@ -1287,7 +1284,7 @@ namespace TShockAPI /// Fired on a mass wire edit operation. public static HandlerList MassWireOperation = new HandlerList(); - private static bool OnMassWireOperation(TSPlayer player, short startX, short startY, short endX, short endY, byte toolMode) + private static bool OnMassWireOperation(TSPlayer player, MemoryStream data, short startX, short startY, short endX, short endY, byte toolMode) { if (MassWireOperation == null) return false; @@ -1295,6 +1292,7 @@ namespace TShockAPI var args = new MassWireOperationEventArgs { Player = player, + Data = data, StartX = startX, StartY = startY, EndX = endX, @@ -3098,7 +3096,7 @@ namespace TShockAPI short endY = args.Data.ReadInt16(); byte toolMode = (byte) args.Data.ReadByte(); - if (OnMassWireOperation(args.Player, startX, startY, endX, endY, toolMode)) + if (OnMassWireOperation(args.Player, args.Data, startX, startY, endX, endY, toolMode)) return true; return false;