From 50104612cf0b90f90b7ed3493299beb12bca3990 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 23 Dec 2017 14:35:32 -0700 Subject: [PATCH] OnNewProjectile now uses GetDataHandledEventArgs. --- TShockAPI/GetDataHandlers.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index a7b0e0a0..854e2b70 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -743,10 +743,8 @@ namespace TShockAPI /// /// For use in a NewProjectile event /// - public class NewProjectileEventArgs : HandledEventArgs + public class NewProjectileEventArgs : GetDataHandledEventArgs { - /// The TSPlayer that triggered the new projectile. - public TSPlayer Player { get; set; } /// /// ??? /// @@ -785,13 +783,14 @@ namespace TShockAPI /// public static HandlerList NewProjectile = new HandlerList(); - private static bool OnNewProjectile(short ident, Vector2 pos, Vector2 vel, float knockback, short dmg, byte owner, short type, int index, TSPlayer player) + private static bool OnNewProjectile(MemoryStream data, short ident, Vector2 pos, Vector2 vel, float knockback, short dmg, byte owner, short type, int index, TSPlayer player) { if (NewProjectile == null) return false; var args = new NewProjectileEventArgs { + Data = data, Identity = ident, Position = pos, Velocity = vel, @@ -2382,7 +2381,7 @@ namespace TShockAPI var index = TShock.Utils.SearchProjectile(ident, owner); - if (OnNewProjectile(ident, pos, vel, knockback, dmg, owner, type, index, args.Player)) + if (OnNewProjectile(args.Data, ident, pos, vel, knockback, dmg, owner, type, index, args.Player)) return true; return false;