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

OnNewProjectile now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:35:32 -07:00
parent 40755192b3
commit 50104612cf
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

@ -743,10 +743,8 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a NewProjectile event /// For use in a NewProjectile event
/// </summary> /// </summary>
public class NewProjectileEventArgs : HandledEventArgs public class NewProjectileEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer that triggered the new projectile.</summary>
public TSPlayer Player { get; set; }
/// <summary> /// <summary>
/// ??? /// ???
/// </summary> /// </summary>
@ -785,13 +783,14 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<NewProjectileEventArgs> NewProjectile = new HandlerList<NewProjectileEventArgs>(); public static HandlerList<NewProjectileEventArgs> NewProjectile = new HandlerList<NewProjectileEventArgs>();
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) if (NewProjectile == null)
return false; return false;
var args = new NewProjectileEventArgs var args = new NewProjectileEventArgs
{ {
Data = data,
Identity = ident, Identity = ident,
Position = pos, Position = pos,
Velocity = vel, Velocity = vel,
@ -2382,7 +2381,7 @@ namespace TShockAPI
var index = TShock.Utils.SearchProjectile(ident, owner); 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 true;
return false; return false;