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

Fix possible null references. Remove noclip check, I bypassed it in 5 seconds in zidomod... So useless

Browse source
This commit is contained in:
Zidonuke 2011-12-20 19:59:55 -05:00
parent 7c09a174e8
commit d343983f2c
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/GetDataHandlers.cs
View file

@ -582,13 +582,6 @@ namespace TShockAPI
args.Player.Spawn(); args.Player.Spawn();
return true; return true;
} }
if (TShock.CheckPlayerCollision((int)(pos.X / 16f), (int)(pos.Y / 16f))) //NoClipping or possible errors
{
args.Player.SendMessage("You got stuck in a solid object! Sent you to the spawn point.", Color.Red);
args.Player.SendTileSquare((int)(pos.X / 16f), (int)(pos.X / 16f));
args.Player.Spawn();
return true;
}
} }
args.Player.LastNetPosition = pos; args.Player.LastNetPosition = pos;

22
TShockAPI/TSPlayer.cs
View file

@ -444,15 +444,15 @@ namespace TShockAPI
{ {
this.inventory[0].netID = -15; this.inventory[0].netID = -15;
this.inventory[0].stack = 1; this.inventory[0].stack = 1;
if(player.TPlayer.inventory[0].netID == -15) if(player.TPlayer.inventory[0] != null && player.TPlayer.inventory[0].netID == -15)
this.inventory[0].prefix = player.TPlayer.inventory[0].prefix; this.inventory[0].prefix = player.TPlayer.inventory[0].prefix;
this.inventory[1].netID = -13; this.inventory[1].netID = -13;
this.inventory[1].stack = 1; this.inventory[1].stack = 1;
if (player.TPlayer.inventory[1].netID == -13) if (player.TPlayer.inventory[1] != null && player.TPlayer.inventory[1].netID == -13)
this.inventory[1].prefix = player.TPlayer.inventory[1].prefix; this.inventory[1].prefix = player.TPlayer.inventory[1].prefix;
this.inventory[2].netID = -16; this.inventory[2].netID = -16;
this.inventory[2].stack = 1; this.inventory[2].stack = 1;
if (player.TPlayer.inventory[2].netID == -16) if (player.TPlayer.inventory[2] != null && player.TPlayer.inventory[2].netID == -16)
this.inventory[2].prefix = player.TPlayer.inventory[2].prefix; this.inventory[2].prefix = player.TPlayer.inventory[2].prefix;
} }
@ -478,8 +478,16 @@ namespace TShockAPI
for (int i = 0; i < NetItem.maxNetInventory; i++) for (int i = 0; i < NetItem.maxNetInventory; i++)
{ {
if (i < 49) if (i < 49)
{
if (player.TPlayer.inventory[i] != null)
{ {
this.inventory[i].netID = inventory[i].netID; this.inventory[i].netID = inventory[i].netID;
}
else
{
this.inventory[i].netID = 0;
}
if (this.inventory[i].netID != 0) if (this.inventory[i].netID != 0)
{ {
this.inventory[i].stack = inventory[i].stack; this.inventory[i].stack = inventory[i].stack;
@ -492,8 +500,16 @@ namespace TShockAPI
} }
} }
else else
{
if (player.TPlayer.armor[i] != null)
{ {
this.inventory[i].netID = armor[i].netID; this.inventory[i].netID = armor[i].netID;
}
else
{
this.inventory[i].netID = 0;
}
if (this.inventory[i].netID != 0) if (this.inventory[i].netID != 0)
{ {
this.inventory[i].stack = armor[i].stack; this.inventory[i].stack = armor[i].stack;