From 61f6bb1a019adf0ed7f18109d2c81beb7a281faa Mon Sep 17 00:00:00 2001 From: PhoenixICE Date: Mon, 14 Oct 2013 16:18:39 +1100 Subject: [PATCH] Fixed double teleporting with SSC users getting teleported twice with ssc and rememberpos if they didn't have loginbeforejoin enabled --- TShockAPI/TShock.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index dc28ab4c..3316b6e0 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1138,10 +1138,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;