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

Merge fail

Browse source
This commit is contained in:
Deathmax 2012-01-20 14:35:59 +08:00
parent 733be6b84e
commit 672d360e9d
5 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Utils.cs
View file

@ -624,14 +624,14 @@ namespace TShockAPI
return true;
}
public int SearchProjectile(short identity)
public int SearchProjectile(short identity, int owner)
{
for (int i = 0; i < Main.maxProjectiles; i++)
{
if (Main.projectile[i].identity == identity)
if (Main.projectile[i].identity == identity && Main.projectile[i].owner == owner)
return i;
}
return 1001;
return 1000;
}
public string SanitizeString(string str)