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

OnProjectileKill now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:25:30 -07:00
parent fd7b9858df
commit 551762f10e
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/GetDataHandlers.cs
View file

@ -411,10 +411,8 @@ namespace TShockAPI
} }
/// <summary>The arguments to the ProjectileKill packet.</summary> /// <summary>The arguments to the ProjectileKill packet.</summary>
public class ProjectileKillEventArgs : HandledEventArgs public class ProjectileKillEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that fired the event.</summary>
public TSPlayer Player;
/// <summary>The projectile's identity...?</summary> /// <summary>The projectile's identity...?</summary>
public int ProjectileIdentity; public int ProjectileIdentity;
/// <summary>The the player index of the projectile's owner (Main.players).</summary> /// <summary>The the player index of the projectile's owner (Main.players).</summary>
@ -432,7 +430,7 @@ namespace TShockAPI
/// <param name="owner">The projectile's owner (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> /// <param name="index">The projectile's index (from Main.projectiles).</param>
/// <returns>bool</returns> /// <returns>bool</returns>
private static bool OnProjectileKill(TSPlayer player, int identity, byte owner, int index) private static bool OnProjectileKill(TSPlayer player, MemoryStream data, int identity, byte owner, int index)
{ {
if (ProjectileKill == null) if (ProjectileKill == null)
return false; return false;
@ -440,6 +438,7 @@ namespace TShockAPI
var args = new ProjectileKillEventArgs var args = new ProjectileKillEventArgs
{ {
Player = player, Player = player,
Data = data,
ProjectileIdentity = identity, ProjectileIdentity = identity,
ProjectileOwner = owner, ProjectileOwner = owner,
ProjectileIndex = index, ProjectileIndex = index,
@ -2405,7 +2404,7 @@ namespace TShockAPI
owner = (byte)args.Player.Index; owner = (byte)args.Player.Index;
var index = TShock.Utils.SearchProjectile(ident, owner); var index = TShock.Utils.SearchProjectile(ident, owner);
if (OnProjectileKill(args.Player, ident, owner, index)) if (OnProjectileKill(args.Player, args.Data, ident, owner, index))
{ {
return true; return true;
} }