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

Move most of HandleProjectileKill to Bouncer

Browse source 
Added GetDataHandlers.ProjectileKill hook and related arguments.
Fired when a projectile kill packet is accepted by the server.
This commit is contained in:
Lucas Nicodemus 2017-12-10 23:05:50 -07:00
parent 2cfa633df4
commit c5f9a51802
3 changed files with 71 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

56
TShockAPI/GetDataHandlers.cs
View file

@ -384,6 +384,45 @@ namespace TShockAPI
return args.Handled;
}
/// <summary>The arguments to the ProjectileKill packet.</summary>
public class ProjectileKillEventArgs : HandledEventArgs
{
/// <summary>The TSPlayer that fired the event.</summary>
public TSPlayer Player;
/// <summary>The projectile's identity...?</summary>
public int ProjectileIdentity;
/// <summary>The the player index of the projectile's owner (Main.players).</summary>
public byte ProjectileOwner;
/// <summary>The index of the projectile in Main.projectile.</summary>
public int ProjectileIndex;
}
/// <summary>The event fired when a projectile kill packet is received.</summary>
public static HandlerList<ProjectileKillEventArgs> ProjectileKill;
/// <summary>Fires the ProjectileKill event.</summary>
/// <param name="player">The TSPlayer that caused the event.</param>
/// <param name="identity">The projectile identity (from the packet).</param>
/// <param name="owner">The projectile's owner (from the packet).</param>
/// <param name="index">The projectile's index (from Main.projectiles).</param>
/// <returns>bool</returns>
private static bool OnProjectileKill(TSPlayer player, int identity, byte owner, int index)
{
if (ProjectileKill == null)
return false;
var args = new ProjectileKillEventArgs
{
Player = player,
ProjectileIdentity = identity,
ProjectileOwner = owner,
ProjectileIndex = index,
};
ProjectileKill.Invoke(null, args);
return args.Handled;
}
/// <summary>
/// For use in a KillMe event
/// </summary>
@ -2213,19 +2252,14 @@ namespace TShockAPI
owner = (byte)args.Player.Index;
var index = TShock.Utils.SearchProjectile(ident, owner);
if (index > Main.maxProjectiles || index < 0)
if (OnProjectileKill(args.Player, ident, owner, index))
{
return false;
return true;
}
var type = Main.projectile[index].type;
if (TShock.CheckIgnores(args.Player))
{
args.Player.RemoveProjectile(ident, owner);
return true;
}
// TODO: This needs to be moved somewhere else.
if (TShock.CheckProjectilePermission(args.Player, index, type) && type != 102 && type != 100 && !TShock.Config.IgnoreProjKill)
{
args.Player.Disable("Does not have projectile permission to kill projectile.", DisableFlags.WriteToLogAndConsole);
@ -2233,12 +2267,6 @@ namespace TShockAPI
return true;
}
if ((DateTime.UtcNow - args.Player.LastThreat).TotalMilliseconds < 5000)
{
args.Player.RemoveProjectile(ident, owner);
return true;
}
args.Player.LastKilledProjectile = type;
return false;