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

OnMassWireOperation now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:27:00 -07:00
parent 61d1bcf93f
commit 16654cafc4
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/GetDataHandlers.cs
View file

@ -1263,11 +1263,8 @@ namespace TShockAPI
} }
/// <summary>The arguments to the MassWireOperation event.</summary> /// <summary>The arguments to the MassWireOperation event.</summary>
public class MassWireOperationEventArgs : HandledEventArgs public class MassWireOperationEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that triggered the event.</summary>
public TSPlayer Player { get; set; }
/// <summary>The start X point in the operation.</summary> /// <summary>The start X point in the operation.</summary>
public short StartX { get; set; } public short StartX { get; set; }
@ -1287,7 +1284,7 @@ namespace TShockAPI
/// <summary>Fired on a mass wire edit operation.</summary> /// <summary>Fired on a mass wire edit operation.</summary>
public static HandlerList<MassWireOperationEventArgs> MassWireOperation = new HandlerList<MassWireOperationEventArgs>(); public static HandlerList<MassWireOperationEventArgs> MassWireOperation = new HandlerList<MassWireOperationEventArgs>();
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) if (MassWireOperation == null)
return false; return false;
@ -1295,6 +1292,7 @@ namespace TShockAPI
var args = new MassWireOperationEventArgs var args = new MassWireOperationEventArgs
{ {
Player = player, Player = player,
Data = data,
StartX = startX, StartX = startX,
StartY = startY, StartY = startY,
EndX = endX, EndX = endX,
@ -3098,7 +3096,7 @@ namespace TShockAPI
short endY = args.Data.ReadInt16(); short endY = args.Data.ReadInt16();
byte toolMode = (byte) args.Data.ReadByte(); 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 true;
return false; return false;