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

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

Browse source
This commit is contained in:
high 2011-06-28 10:32:25 -04:00
commit ae1e16de10
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

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