From 8f32374cdab7a6cc531305335eb238b63cd1fbd9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 24 Jan 2013 14:03:00 +1100
Subject: [PATCH] Dont remove from server if not connected to one.

---
 proxy/src/main/java/net/md_5/bungee/UserConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 32a2c154e..c17447d65 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -152,12 +152,12 @@ public class UserConnection extends GenericConnection implements ProxiedPlayer
 
     private void destroySelf(String reason)
     {
-        server.getInfo().removePlayer(this);
         ProxyServer.getInstance().getPlayers().remove(this);
 
         disconnect(reason);
         if (server != null)
         {
+            server.getInfo().removePlayer(this);
             server.disconnect("Quitting");
             ProxyServer.getInstance().getReconnectHandler().setServer(this);
         }