Revert fdd4959dd2

patches/net/minecraft/server/management/ServerConfigurationManager.java.patch

@@ -379,7 +379,7 @@
  
      public EntityPlayerMP createPlayerForUser(GameProfile p_148545_1_)
      {
-@@ -410,80 +619,211 @@
+@@ -410,80 +619,204 @@
          return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), p_148545_1_, (ItemInWorldManager)object);
      }
  
@@ -492,7 +492,7 @@
 -        this.func_72381_a(entityplayermp1, p_72368_1_, worldserver);
 +        // Phase 3 - remove current player from current dimension
 +        par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removePlayerFromTrackers(par1EntityPlayerMP);
-+        par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeEntityFromAllTrackingPlayers(par1EntityPlayerMP); // CraftBukkit
++        // par1EntityPlayerMP.getServerForPlayer().getEntityTracker().removeEntityFromAllTrackingPlayers(par1EntityPlayerMP); // CraftBukkit
 +        par1EntityPlayerMP.getServerForPlayer().getPlayerManager().removePlayer(par1EntityPlayerMP);
 +        this.playerEntityList.remove(par1EntityPlayerMP);
 +        this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension).removePlayerEntityDangerously(par1EntityPlayerMP);
@@ -501,17 +501,10 @@
 +        ChunkCoordinates bedSpawnChunkCoords = par1EntityPlayerMP.getBedLocation(targetDimension);
 +        boolean spawnForced = par1EntityPlayerMP.isSpawnForced(targetDimension);
 +        par1EntityPlayerMP.dimension = targetDimension;
-+
-+        Object object = new ItemInWorldManager(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension));
-+
 +        // CraftBukkit start
-+        EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.getGameProfile(), (ItemInWorldManager)object);
-+        entityplayermp1.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler;
++        EntityPlayerMP entityplayermp1 = par1EntityPlayerMP;
 +        entityplayermp1.clonePlayer(par1EntityPlayerMP, returnFromEnd); // KCauldron - clone player
 +        entityplayermp1.setWorld(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension)); // make sure to update reference for bed spawn logic
-+        // entityplayermp1.dimension = targetDimension; <- ABOVE DOES THIS AUTOMATICALLY
-+        entityplayermp1.setEntityId(par1EntityPlayerMP.getEntityId());
-+
 +        entityplayermp1.playerConqueredTheEnd = false;
          ChunkCoordinates chunkcoordinates1;
 +        boolean isBedSpawn = false;
@@ -631,7 +624,7 @@
          return entityplayermp1;
      }
  
-@@ -492,34 +832,112 @@
+@@ -492,34 +825,112 @@
          transferPlayerToDimension(p_72356_1_, p_72356_2_, mcServer.worldServerForDimension(p_72356_2_).getDefaultTeleporter());
      }
  
@@ -763,7 +756,7 @@
      }
  
      public void transferEntityToWorld(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_, Teleporter teleporter)
-@@ -605,6 +1023,109 @@
+@@ -605,6 +1016,109 @@
          p_82448_1_.setWorld(p_82448_4_);
      }
  
@@ -873,7 +866,7 @@
      public void sendPlayerInfoToAllPlayers()
      {
          if (++this.playerPingIndex > 600)
-@@ -612,11 +1133,13 @@
+@@ -612,11 +1126,13 @@
              this.playerPingIndex = 0;
          }
  
@@ -887,7 +880,7 @@
      }
  
      public void sendPacketToAllPlayers(Packet p_148540_1_)
-@@ -877,13 +1400,24 @@
+@@ -877,13 +1393,24 @@
          for (int j = 0; j < this.playerEntityList.size(); ++j)
          {
              EntityPlayerMP entityplayermp = (EntityPlayerMP)this.playerEntityList.get(j);
@@ -914,7 +907,7 @@
                  if (d4 * d4 + d5 * d5 + d6 * d6 < p_148543_8_ * p_148543_8_)
                  {
                      entityplayermp.playerNetServerHandler.sendPacket(p_148543_11_);
-@@ -941,13 +1475,16 @@
+@@ -941,13 +1468,16 @@
              p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(1, 0.0F));
              p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(7, p_72354_2_.getRainStrength(1.0F)));
              p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(8, p_72354_2_.getWeightedThunderStrength(1.0F)));
@@ -932,7 +925,7 @@
          p_72385_1_.playerNetServerHandler.sendPacket(new S09PacketHeldItemChange(p_72385_1_.inventory.currentItem));
      }
  
-@@ -961,9 +1498,17 @@
+@@ -961,9 +1491,17 @@
          return this.maxPlayers;
      }
  
@@ -951,7 +944,7 @@
      }
  
      public void setWhiteListEnabled(boolean p_72371_1_)
-@@ -1032,11 +1577,29 @@
+@@ -1032,11 +1570,29 @@
  
      public void removeAllPlayers()
      {
@@ -983,7 +976,7 @@
  
      public void sendChatMsgImpl(IChatComponent p_148544_1_, boolean p_148544_2_)
      {
-@@ -1103,4 +1666,4 @@
+@@ -1103,4 +1659,4 @@
      {
          return this.whiteListEnforced;
      }