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

OnPlaceItemFrame now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:19:44 -07:00
parent c6a5de4398
commit 8bb3b88ab0
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

@ -3120,11 +3120,8 @@ namespace TShockAPI
} }
/// <summary>The arguments to the PlaceItemFrame event.</summary> /// <summary>The arguments to the PlaceItemFrame event.</summary>
public class PlaceItemFrameEventArgs : HandledEventArgs public class PlaceItemFrameEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that triggered the event.</summary>
public TSPlayer Player { get; set; }
/// <summary>The X coordinate of the item frame.</summary> /// <summary>The X coordinate of the item frame.</summary>
public short X { get; set; } public short X { get; set; }
@ -3147,7 +3144,7 @@ namespace TShockAPI
/// <summary>Fired when an ItemFrame is placed.</summary> /// <summary>Fired when an ItemFrame is placed.</summary>
public static HandlerList<PlaceItemFrameEventArgs> PlaceItemFrame = new HandlerList<PlaceItemFrameEventArgs>(); public static HandlerList<PlaceItemFrameEventArgs> PlaceItemFrame = new HandlerList<PlaceItemFrameEventArgs>();
private static bool OnPlaceItemFrame(TSPlayer player, short x, short y, short itemID, byte prefix, short stack, TEItemFrame itemFrame) private static bool OnPlaceItemFrame(TSPlayer player, MemoryStream data, short x, short y, short itemID, byte prefix, short stack, TEItemFrame itemFrame)
{ {
if (PlaceItemFrame == null) if (PlaceItemFrame == null)
return false; return false;
@ -3155,6 +3152,7 @@ namespace TShockAPI
var args = new PlaceItemFrameEventArgs var args = new PlaceItemFrameEventArgs
{ {
Player = player, Player = player,
Data = data,
X = x, X = x,
Y = y, Y = y,
ItemID = itemID, ItemID = itemID,
@ -3313,7 +3311,7 @@ namespace TShockAPI
var stack = args.Data.ReadInt16(); var stack = args.Data.ReadInt16();
var itemFrame = (TEItemFrame)TileEntity.ByID[TEItemFrame.Find(x, y)]; var itemFrame = (TEItemFrame)TileEntity.ByID[TEItemFrame.Find(x, y)];
if (OnPlaceItemFrame(args.Player, x, y, itemID, prefix, stack, itemFrame)) if (OnPlaceItemFrame(args.Player, args.Data, x, y, itemID, prefix, stack, itemFrame))
{ {
return true; return true;
} }