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

OnPlaceObject now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:33:12 -07:00
parent a3ca7f3d0e
commit 40755192b3
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/GetDataHandlers.cs
View file

@ -682,7 +682,7 @@ namespace TShockAPI
} }
/// <summary>The arguments to the PlaceObject hook.</summary> /// <summary>The arguments to the PlaceObject hook.</summary>
public class PlaceObjectEventArgs : HandledEventArgs public class PlaceObjectEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The calling Player.</summary> /// <summary>The calling Player.</summary>
public TSPlayer Player { get; set; } public TSPlayer Player { get; set; }
@ -718,7 +718,7 @@ namespace TShockAPI
/// <param name="alternate">The object's alternate data.</param> /// <param name="alternate">The object's alternate data.</param>
/// <param name="direction">The direction of the object.</param> /// <param name="direction">The direction of the object.</param>
/// <returns>bool</returns> /// <returns>bool</returns>
private static bool OnPlaceObject(TSPlayer player, short x, short y, short type, short style, byte alternate, bool direction) private static bool OnPlaceObject(TSPlayer player, MemoryStream data, short x, short y, short type, short style, byte alternate, bool direction)
{ {
if (PlaceObject == null) if (PlaceObject == null)
return false; return false;
@ -726,6 +726,7 @@ namespace TShockAPI
var args = new PlaceObjectEventArgs var args = new PlaceObjectEventArgs
{ {
Player = player, Player = player,
Data = data,
X = x, X = x,
Y = y, Y = y,
Type = type, Type = type,
@ -2091,7 +2092,7 @@ namespace TShockAPI
byte alternate = args.Data.ReadInt8(); byte alternate = args.Data.ReadInt8();
bool direction = args.Data.ReadBoolean(); bool direction = args.Data.ReadBoolean();
if (OnPlaceObject(args.Player, x, y, type, style, alternate, direction)) if (OnPlaceObject(args.Player, args.Data, x, y, type, style, alternate, direction))
return true; return true;
return false; return false;