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

Merge pull request #666 from PhoenixICE/general-devel

Browse source 
merging even though this is PR#666 !!!
This commit is contained in:
k0rd 2013-10-18 19:39:41 -07:00
commit 11edf7f61b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/TShock.cs
View file

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