Merge remote-tracking branch 'origin/master'

Conflicts: TShockAPI/Commands.cs
2011-06-24 22:45:34 +08:00 · 2011-06-24 22:45:34 +08:00 · 840c91d341
commit 840c91d341
parent a0c71e7b30 efc36825a3
2 changed files with 7 additions and 4 deletions
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@ -596,6 +596,9 @@ namespace TShockAPI
                    if (playerIP.IP == Players[who].IP)
                    {
                        Players[who].Teleport((int)playerIP.Pos.X, (int)playerIP.Pos.Y);
+                        RemeberedPosManager.RemeberedPosistions.Remove(playerIP);
+                        RemeberedPosManager.WriteSettings();
+                        break;
                    }
                }
            }