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

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

Browse source
This commit is contained in:
MarioE 2013-10-23 18:08:36 -04:00
commit 666ea54e1e
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TShockAPI/GetDataHandlers.cs
View file

@ -2503,10 +2503,15 @@ 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;
int textlength = (int) (args.Data.Length - args.Data.Position - 1); int textlength = (int)(args.Data.Length - args.Data.Position - 1);
string deathtext = ""; string deathtext = "";
if (textlength > 0) if (textlength > 0)
{ {
@ -2882,6 +2887,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);
@ -2988,8 +2999,10 @@ 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)
{ {
@ -3341,7 +3354,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/TShock.cs
View file

@ -1150,7 +1150,7 @@ namespace TShockAPI
player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f); player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f);
if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero) && Config.ServerSideCharacter && Config.DisableLoginBeforeJoin) if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero) && !player.LoginHarassed)
{ {
player.RPPending=3; player.RPPending=3;
player.SendMessage("You will be teleported to your last known location...", Color.Red); player.SendMessage("You will be teleported to your last known location...", Color.Red);

3
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)
@ -592,6 +592,7 @@ namespace TShockAPI
TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs()); TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
TShock.Groups.LoadPermisions(); TShock.Groups.LoadPermisions();
TShock.Regions.ReloadAllRegions(); TShock.Regions.ReloadAllRegions();
TShock.Itembans.UpdateItemBans();
Hooks.GeneralHooks.OnReloadEvent(player); Hooks.GeneralHooks.OnReloadEvent(player);
} }