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

Merge remote-tracking branch 'origin/general-devel' into noclip

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-26 20:33:22 -07:00
commit 227125199a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Bouncer.cs
View file

@ -963,7 +963,7 @@ namespace TShockAPI
short type = args.Type; short type = args.Type;
int index = args.Index; int index = args.Index;
if (index > Main.maxProjectiles || index < 0) if (index > Main.maxProjectiles)
{ {
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
args.Handled = true; args.Handled = true;

4
TShockAPI/Utils.cs
View file

@ -925,7 +925,7 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="identity">identity</param> /// <param name="identity">identity</param>
/// <param name="owner">owner</param> /// <param name="owner">owner</param>
/// <returns>projectile ID or -1 if not found</returns> /// <returns>projectile ID</returns>
public int SearchProjectile(short identity, int owner) public int SearchProjectile(short identity, int owner)
{ {
for (int i = 0; i < Main.maxProjectiles; i++) for (int i = 0; i < Main.maxProjectiles; i++)
@ -933,7 +933,7 @@ namespace TShockAPI
if (Main.projectile[i].identity == identity && Main.projectile[i].owner == owner) if (Main.projectile[i].identity == identity && Main.projectile[i].owner == owner)
return i; return i;
} }
return -1; return 1000;
} }
/// <summary> /// <summary>