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

OnUpdateNPCHome now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:20:35 -07:00
parent 82a749c24d
commit ed1a04b38b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/GetDataHandlers.cs
View file

@ -1016,10 +1016,8 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a NPCHome event /// For use in a NPCHome event
/// </summary> /// </summary>
public class NPCHomeChangeEventArgs : HandledEventArgs public class NPCHomeChangeEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that caused the event.</summary>
public TSPlayer Player { get; set; }
/// <summary> /// <summary>
/// The Terraria playerID of the player /// The Terraria playerID of the player
/// </summary> /// </summary>
@ -1042,7 +1040,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<NPCHomeChangeEventArgs> NPCHome = new HandlerList<NPCHomeChangeEventArgs>(); public static HandlerList<NPCHomeChangeEventArgs> NPCHome = new HandlerList<NPCHomeChangeEventArgs>();
private static bool OnUpdateNPCHome(TSPlayer player, short id, short x, short y, byte homeless) private static bool OnUpdateNPCHome(TSPlayer player, MemoryStream data, short id, short x, short y, byte homeless)
{ {
if (NPCHome == null) if (NPCHome == null)
return false; return false;
@ -1050,6 +1048,7 @@ namespace TShockAPI
var args = new NPCHomeChangeEventArgs var args = new NPCHomeChangeEventArgs
{ {
Player = player, Player = player,
Data = data,
ID = id, ID = id,
X = x, X = x,
Y = y, Y = y,
@ -2627,7 +2626,7 @@ namespace TShockAPI
var y = args.Data.ReadInt16(); var y = args.Data.ReadInt16();
var homeless = args.Data.ReadInt8(); var homeless = args.Data.ReadInt8();
if (OnUpdateNPCHome(args.Player, id, x, y, homeless)) if (OnUpdateNPCHome(args.Player, args.Data, id, x, y, homeless))
return true; return true;
if (!args.Player.HasPermission(Permissions.movenpc)) if (!args.Player.HasPermission(Permissions.movenpc))