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

Null and range check for HandlePlayerDamage.

Browse source
This commit is contained in:
Deathmax 2011-06-28 17:17:24 +08:00
parent aa3a491dab
commit feb4754b14
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/GetDataHandlers.cs
View file

@ -360,7 +360,10 @@ namespace TShockAPI
private static bool HandlePlayerDamage(GetDataHandlerArgs args) private static bool HandlePlayerDamage(GetDataHandlerArgs args)
{ {
byte playerid = args.Data.ReadInt8(); 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) private static bool HandleLiquidSet(GetDataHandlerArgs args)