From 0221201000c20ea61eed7c7f8ea228dfce29f382 Mon Sep 17 00:00:00 2001
From: Robotia <robotia@users.noreply.github.com>
Date: Wed, 2 Mar 2016 12:50:02 -0500
Subject: [PATCH] Pass EntityPlayer to netHandler

---
 .../ServerConfigurationManager.java.patch       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
index 926f33de..4b428e1f 100644
--- a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
+++ b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
@@ -389,7 +389,7 @@
      public EntityPlayerMP createPlayerForUser(GameProfile p_148545_1_)
      {
          UUID uuid = EntityPlayer.func_146094_a(p_148545_1_);
-@@ -410,80 +621,249 @@
+@@ -410,80 +621,250 @@
          return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), p_148545_1_, (ItemInWorldManager)object);
      }
  
@@ -528,6 +528,7 @@
 +        
 +        EntityPlayerMP entityplayermp1 =  new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(p_72368_1_.dimension), p_72368_1_.getGameProfile(), (ItemInWorldManager)object);;
 +        entityplayermp1.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler;
++        entityplayermp1.playerNetServerHandler.playerEntity = entityplayermp1;
 +        entityplayermp1.clonePlayer(par1EntityPlayerMP, returnFromEnd);
 +        // entityplayermp1.dimension = targetDimension; Thermos move this call to later when actualDimension is found
 +        // HEY don't setWorld here either, that has to down to the bottom
@@ -677,7 +678,7 @@
          return entityplayermp1;
      }
  
-@@ -492,34 +872,112 @@
+@@ -492,34 +873,112 @@
          transferPlayerToDimension(p_72356_1_, p_72356_2_, mcServer.worldServerForDimension(p_72356_2_).getDefaultTeleporter());
      }
  
@@ -809,7 +810,7 @@
      }
  
      public void transferEntityToWorld(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_, Teleporter teleporter)
-@@ -605,6 +1063,109 @@
+@@ -605,6 +1064,109 @@
          p_82448_1_.setWorld(p_82448_4_);
      }
  
@@ -919,7 +920,7 @@
      public void sendPlayerInfoToAllPlayers()
      {
          if (++this.playerPingIndex > 600)
-@@ -612,11 +1173,13 @@
+@@ -612,11 +1174,13 @@
              this.playerPingIndex = 0;
          }
  
@@ -933,7 +934,7 @@
      }
  
      public void sendPacketToAllPlayers(Packet p_148540_1_)
-@@ -877,13 +1440,24 @@
+@@ -877,13 +1441,24 @@
          for (int j = 0; j < this.playerEntityList.size(); ++j)
          {
              EntityPlayerMP entityplayermp = (EntityPlayerMP)this.playerEntityList.get(j);
@@ -960,7 +961,7 @@
                  if (d4 * d4 + d5 * d5 + d6 * d6 < p_148543_8_ * p_148543_8_)
                  {
                      entityplayermp.playerNetServerHandler.sendPacket(p_148543_11_);
-@@ -941,13 +1515,16 @@
+@@ -941,13 +1516,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)));
@@ -978,7 +979,7 @@
          p_72385_1_.playerNetServerHandler.sendPacket(new S09PacketHeldItemChange(p_72385_1_.inventory.currentItem));
      }
  
-@@ -961,9 +1538,17 @@
+@@ -961,9 +1539,17 @@
          return this.maxPlayers;
      }
  
@@ -997,7 +998,7 @@
      }
  
      public void setWhiteListEnabled(boolean p_72371_1_)
-@@ -1032,12 +1617,30 @@
+@@ -1032,12 +1618,30 @@
  
      public void removeAllPlayers()
      {