From c6c4446021c869ccd52a0c8838cfac04db8c98d8 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:29:16 -0700 Subject: [PATCH] OnPlayerUpdate now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 00a3f02d..b2f08e89 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -499,10 +499,8 @@ namespace TShockAPI /// /// For use in a PlayerUpdate event /// - public class PlayerUpdateEventArgs : HandledEventArgs + public class PlayerUpdateEventArgs : GetDataHandledEventArgs { - /// The TSPlayer object that triggered the event - public TSPlayer Player { get; set; } /// /// The Terraria playerID of the player /// @@ -531,7 +529,7 @@ namespace TShockAPI /// public static HandlerList PlayerUpdate = new HandlerList(); - private static bool OnPlayerUpdate(TSPlayer player, byte plr, byte control, byte item, Vector2 position, Vector2 velocity, byte pulley) + private static bool OnPlayerUpdate(TSPlayer player, MemoryStream data, byte plr, byte control, byte item, Vector2 position, Vector2 velocity, byte pulley) { if (PlayerUpdate == null) return false; @@ -539,6 +537,7 @@ namespace TShockAPI var args = new PlayerUpdateEventArgs { Player = player, + Data = data, PlayerId = plr, Control = control, Item = item, @@ -549,6 +548,7 @@ namespace TShockAPI PlayerUpdate.Invoke(null, args); return args.Handled; } + public static bool TSCheckNoclip(Vector2 Position, int Width, int Height) { int num = (int)(Position.X / 16f); @@ -2242,7 +2242,7 @@ namespace TShockAPI if (pulley[2]) vel = new Vector2(args.Data.ReadSingle(), args.Data.ReadSingle()); - if (OnPlayerUpdate(args.Player, plr, control, item, pos, vel, pulley)) + if (OnPlayerUpdate(args.Player, args.Data, plr, control, item, pos, vel, pulley)) return true; if (control[5])