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

Move OnPlayerAnimation to Bouncer

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-15 21:50:20 -07:00
parent d03e899452
commit cdba07c62e
3 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
TShockAPI/GetDataHandlers.cs
View file

@ -1298,6 +1298,8 @@ namespace TShockAPI
/// </summary>
public class PlayerAnimationEventArgs : HandledEventArgs
{
/// <summary>The TSPlayer that triggered the event.</summary>
public TSPlayer Player { get; set; }
}
/// <summary>
@ -1305,12 +1307,15 @@ namespace TShockAPI
/// </summary>
public static HandlerList<PlayerAnimationEventArgs> PlayerAnimation;
private static bool OnPlayerAnimation()
private static bool OnPlayerAnimation(TSPlayer player)
{
if (PlayerAnimation == null)
return false;
var args = new PlayerAnimationEventArgs { };
var args = new PlayerAnimationEventArgs
{
Player = player,
};
PlayerAnimation.Invoke(null, args);
return args.Handled;
}
@ -2635,21 +2640,9 @@ namespace TShockAPI
private static bool HandlePlayerAnimation(GetDataHandlerArgs args)
{
if (OnPlayerAnimation())
if (OnPlayerAnimation(args.Player))
return true;
if (TShock.CheckIgnores(args.Player))
{
args.Player.SendData(PacketTypes.PlayerAnimation, "", args.Player.Index);
return true;
}
if ((DateTime.UtcNow - args.Player.LastThreat).TotalMilliseconds < 5000)
{
args.Player.SendData(PacketTypes.PlayerAnimation, "", args.Player.Index);
return true;
}
return false;
}