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/GetDataHandlers.cs
This commit is contained in:
high 2011-08-13 12:51:45 -04:00
commit 4100fdc8f6
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TSPlayer.cs
View file

@ -202,6 +202,8 @@ namespace TShockAPI
//Try 300 if it does not work (Higher number - Longer load times - Less chance of error)
if (!SendTileSquare(tilex, tiley, 150))
{
InitSpawn = true;
SendWorldInfo(Main.spawnTileX, Main.spawnTileY, false);
SendMessage("Warning, teleport failed due to being too close to the edge of the map.", Color.Red);
return false;
}