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

Merge branch 'master' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
high 2011-06-28 10:31:57 -04:00
commit 03ed7b8d81
5 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/GetDataHandlers.cs
View file

@ -397,7 +397,10 @@ namespace TShockAPI
private static bool HandlePlayerDamage(GetDataHandlerArgs args)
{
byte playerid = args.Data.ReadInt8();
return !TShock.Players[playerid].TPlayer.hostile;
if (playerid >= 0 && playerid <= Main.maxPlayers && TShock.Players[playerid] != null)
return !TShock.Players[playerid].TPlayer.hostile;
return ConfigurationManager.PermaPvp;
}
private static bool HandleLiquidSet(GetDataHandlerArgs args)