From cd07aaf62c58ad2a47e80291c309c9b20575b1e1 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 15:32:57 -0700 Subject: [PATCH] OnPlayerAnimation now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index e14573d7..807ce0dd 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1376,18 +1376,14 @@ namespace TShockAPI /// /// For use with a PlayerAnimation event /// - public class PlayerAnimationEventArgs : HandledEventArgs - { - /// The TSPlayer that triggered the event. - public TSPlayer Player { get; set; } - } + public class PlayerAnimationEventArgs : GetDataHandledEventArgs { } /// /// PlayerAnimation - Called when a player animates /// public static HandlerList PlayerAnimation = new HandlerList(); - private static bool OnPlayerAnimation(TSPlayer player) + private static bool OnPlayerAnimation(TSPlayer player, MemoryStream data) { if (PlayerAnimation == null) return false; @@ -1395,6 +1391,7 @@ namespace TShockAPI var args = new PlayerAnimationEventArgs { Player = player, + Data = data, }; PlayerAnimation.Invoke(null, args); return args.Handled; @@ -2747,7 +2744,7 @@ namespace TShockAPI private static bool HandlePlayerAnimation(GetDataHandlerArgs args) { - if (OnPlayerAnimation(args.Player)) + if (OnPlayerAnimation(args.Player, args.Data)) return true; return false;