From 3f9c0ebbfee80d04c729a0eb34e70fb132c6fa6c Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:13:51 -0700 Subject: [PATCH] OnPlayerTeam now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 80398dc5..c37566e7 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -173,7 +173,7 @@ namespace TShockAPI /// /// For use in a PlayerTeam event /// - public class PlayerTeamEventArgs : HandledEventArgs + public class PlayerTeamEventArgs : GetDataHandledEventArgs { /// /// The Terraria player ID of the player @@ -188,13 +188,15 @@ namespace TShockAPI /// TogglePvp - called when a player toggles pvp /// public static HandlerList PlayerTeam = new HandlerList(); - private static bool OnPlayerTeam(byte _id, byte _team) + private static bool OnPlayerTeam(TSPlayer player, MemoryStream data, byte _id, byte _team) { if (PlayerTeam == null) return false; var args = new PlayerTeamEventArgs { + Player = player, + Data = data, PlayerId = _id, Team = _team, }; @@ -2201,7 +2203,7 @@ namespace TShockAPI { byte id = args.Data.ReadInt8(); byte team = args.Data.ReadInt8(); - if (OnPlayerTeam(id, team)) + if (OnPlayerTeam(args.Player, args.Data, id, team)) return true; if (id != args.Player.Index)