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 
Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
Shank 2011-06-05 03:30:06 -06:00
commit 73b3def96f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -274,7 +274,7 @@ namespace TShockAPI
{
int ply = args.PlayerID;
string player = args.Message.Remove(0, 3).Trim();
if (Tools.FindPlayer(player) != -1 && player != "")
if (Tools.FindPlayer(player) != -1 && Tools.FindPlayer(player) != -2 && player != "")
{
TShock.Teleport(ply, Main.player[Tools.FindPlayer(player)].position.X, Main.player[Tools.FindPlayer(player)].position.Y);
Tools.SendMessage(ply, "Teleported to " + player);
@ -287,7 +287,7 @@ namespace TShockAPI
{
int ply = args.PlayerID;
string player = args.Message.Remove(0, 7).Trim();
if (Tools.FindPlayer(player) != -1 && player != "")
if (Tools.FindPlayer(player) != -1 && Tools.FindPlayer(player) != -2 && player != "")
{
TShock.Teleport(Tools.FindPlayer(player), Main.player[ply].position.X, Main.player[ply].position.Y);
Tools.SendMessage(Tools.FindPlayer(player), "You were teleported to " + Tools.FindPlayer(ply) + ".");

5
TShockAPI/TShock.cs
View file

@ -738,8 +738,11 @@ namespace TShockAPI
{
for (int i = 0; i < 44; i++)
{
if (Main.player[plr].inventory[i].stack > 255)
if (Main.player[plr].inventory[i].stack > Main.player[plr].inventory[i].maxStack)
{
Log.Info(Tools.FindPlayer(plr) + " had " + Main.player[plr].inventory[i].stack.ToString() + " of " + Main.player[plr].inventory[i].name + " which has a max stack of " + Main.player[plr].inventory[i].maxStack.ToString());
return true;
}
}
return false;
}