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

Fixed getRegion not returning null (functions using it were expecting null too)

Browse source 
Disabled noclip check. (general-devel is not general-test)
Added null check to /region info (Don't commit shit that you know is broken)
This commit is contained in:
high 2011-08-20 13:04:24 -04:00
parent 05f0e9d717
commit 625bab753b
4 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/TShock.cs
View file

@ -383,9 +383,9 @@ namespace TShockAPI
player.TilesDestroyed.Clear();
}
}
if (CheckPlayerCollision(player.TileX, player.TileY))
player.SendMessage("You are currently nocliping!", Color.Red);
if (player.LastDeath != null && player.ForceSpawn && (DateTime.Now - player.LastDeath).Seconds >= 3)
/*if (CheckPlayerCollision(player.TileX, player.TileY))
player.SendMessage("You are currently nocliping!", Color.Red);*/
if (player.ForceSpawn && (DateTime.Now - player.LastDeath).Seconds >= 3)
{
player.Spawn();
player.ForceSpawn = false;