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

Cleanup

Browse source
This commit is contained in:
Zack Piispanen 2013-10-22 02:39:58 -04:00
parent 229d2bf990
commit 95d04d98c3
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/GetDataHandlers.cs
View file

@ -2493,7 +2493,9 @@ namespace TShockAPI
} }
if (id >= Main.maxPlayers) if (id >= Main.maxPlayers)
{
return true; return true;
}
if (OnKillMe(id, direction, dmg, pvp)) if (OnKillMe(id, direction, dmg, pvp))
return true; return true;
@ -2987,7 +2989,9 @@ namespace TShockAPI
} }
if (id >= Main.maxPlayers || TShock.Players[id] == null) if (id >= Main.maxPlayers || TShock.Players[id] == null)
{
return true; return true;
}
if (dmg > TShock.Config.MaxDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index) if (dmg > TShock.Config.MaxDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index)
{ {