From ed1a04b38b412003727ae0501d2752d08b713bae Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:20:35 -0700 Subject: [PATCH] OnUpdateNPCHome now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 8864c966..628fa4e4 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1016,10 +1016,8 @@ namespace TShockAPI /// /// For use in a NPCHome event /// - public class NPCHomeChangeEventArgs : HandledEventArgs + public class NPCHomeChangeEventArgs : GetDataHandledEventArgs { - /// The TSPlayer that caused the event. - public TSPlayer Player { get; set; } /// /// The Terraria playerID of the player /// @@ -1042,7 +1040,7 @@ namespace TShockAPI /// public static HandlerList NPCHome = new HandlerList(); - 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) return false; @@ -1050,6 +1048,7 @@ namespace TShockAPI var args = new NPCHomeChangeEventArgs { Player = player, + Data = data, ID = id, X = x, Y = y, @@ -2627,7 +2626,7 @@ namespace TShockAPI var y = args.Data.ReadInt16(); 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; if (!args.Player.HasPermission(Permissions.movenpc))