diff --git a/src/main/java/net/minecraft/server/PlayerInstance.java b/src/main/java/net/minecraft/server/PlayerInstance.java
index 4eeab83994..deb8be1add 100644
--- a/src/main/java/net/minecraft/server/PlayerInstance.java
+++ b/src/main/java/net/minecraft/server/PlayerInstance.java
@@ -46,8 +46,7 @@ class PlayerInstance {
 
     public void b(EntityPlayer entityplayer) {
         if (!this.b.contains(entityplayer)) {
-            // CraftBukkit
-            // (new IllegalStateException("Failed to remove player. " + entityplayer + " isn\'t in chunk " + this.chunkX + ", " + this.chunkZ)).printStackTrace();
+            (new IllegalStateException("Failed to remove player. " + entityplayer + " isn\'t in chunk " + this.chunkX + ", " + this.chunkZ)).printStackTrace();
         } else {
             this.b.remove(entityplayer);
             if (this.b.size() == 0) {
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index f31caa0182..f2906860da 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -118,9 +118,9 @@ public class ServerConfigurationManager {
         this.playerFileData.a(entityplayer);
         entityplayer.world.kill(entityplayer); // CraftBukkit
         this.players.remove(entityplayer);
-        ((WorldServer) entityplayer.world).manager.removePlayer(entityplayer);
 
         return playerQuitEvent.getQuitMessage(); // CraftBukkit
+        // CraftBukkit end
     }
 
     public EntityPlayer a(NetLoginHandler netloginhandler, String s) {