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

Wrap usages of TShock.Players[] with checks for out of bounds.

Browse source
This commit is contained in:
Zack Piispanen 2013-10-22 02:37:19 -04:00
parent cd13cc97aa
commit 229d2bf990
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/GetDataHandlers.cs
View file

@ -2492,6 +2492,9 @@ namespace TShockAPI
return false; return false;
} }
if (id >= Main.maxPlayers)
return true;
if (OnKillMe(id, direction, dmg, pvp)) if (OnKillMe(id, direction, dmg, pvp))
return true; return true;
@ -2871,6 +2874,12 @@ namespace TShockAPI
args.Player.SendData(PacketTypes.PlayerBuff, "", id); args.Player.SendData(PacketTypes.PlayerBuff, "", id);
return true; return true;
} }
if (id >= Main.maxPlayers)
{
return true;
}
if (!TShock.Players[id].TPlayer.hostile) if (!TShock.Players[id].TPlayer.hostile)
{ {
args.Player.SendData(PacketTypes.PlayerBuff, "", id); args.Player.SendData(PacketTypes.PlayerBuff, "", id);
@ -2977,7 +2986,7 @@ namespace TShockAPI
}*/ }*/
} }
if (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)
@ -3330,7 +3339,7 @@ namespace TShockAPI
return true; return true;
} }
if (Main.player[id] == null || TShock.Players[id] == null) if (id >= Main.maxPlayers || Main.player[id] == null || TShock.Players[id] == null)
{ {
return true; return true;
} }

2
TShockAPI/Utils.cs
View file

@ -258,7 +258,7 @@ namespace TShockAPI
return found; return found;
byte plrID; byte plrID;
if (byte.TryParse(plr, out plrID)) if (byte.TryParse(plr, out plrID) && plrID < Main.maxPlayers)
{ {
TSPlayer player = TShock.Players[plrID]; TSPlayer player = TShock.Players[plrID];
if (player != null && player.Active) if (player != null && player.Active)