Remove the double dimension switch as the issue seems fixed, if it breaks something blame SupaHam

1 files changed, 14 insertions, 15 deletions

diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index f3b868c8..58a116d5 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java	2015-02-04 20:32:58.938127185 +0000
-+++ src/main/java/net/minecraft/server/PlayerList.java	2015-02-04 20:32:58.942127185 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java	2015-02-18 21:30:44.908620069 +0000
++++ src/main/java/net/minecraft/server/PlayerList.java	2015-02-18 21:30:44.912620069 +0000
 @@ -18,6 +18,26 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
@@ -368,7 +368,7 @@
          entityplayer.dimension = i;
          Object object;
  
-@@ -319,80 +476,270 @@
+@@ -319,80 +476,269 @@
          }
  
          EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.getWorldServer(entityplayer.dimension), entityplayer.getProfile(), (PlayerInteractManager) object);
@@ -441,7 +441,6 @@
 +        // CraftBukkit start
 +        byte actualDimension = (byte) (worldserver.getWorld().getEnvironment().getId());
 +        // Force the client to refresh their chunk cache
-+        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn((byte) (actualDimension >= 0 ? -1 : 0), worldserver.getDifficulty(), worldserver.getWorldData().getType(), entityplayer.playerInteractManager.getGameMode()));
 +        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(actualDimension, worldserver.getDifficulty(), worldserver.getWorldData().getType(), entityplayer1.playerInteractManager.getGameMode()));
 +        entityplayer1.spawnIn(worldserver);
 +        entityplayer1.dead = false;
@@ -675,7 +674,7 @@
          if (entity.dimension == -1) {
              d0 = MathHelper.a(d0 / d2, worldserver1.af().b() + 16.0D, worldserver1.af().d() - 16.0D);
              d1 = MathHelper.a(d1 / d2, worldserver1.af().c() + 16.0D, worldserver1.af().e() - 16.0D);
-@@ -411,6 +758,8 @@
+@@ -411,6 +757,8 @@
              BlockPosition blockposition;
  
              if (i == 1) {
@@ -684,7 +683,7 @@
                  blockposition = worldserver1.getSpawn();
              } else {
                  blockposition = worldserver1.getDimensionSpawn();
-@@ -424,15 +773,26 @@
+@@ -424,15 +772,26 @@
                  worldserver.entityJoinedWorld(entity, false);
              }
          }
@@ -713,7 +712,7 @@
                  worldserver1.addEntity(entity);
                  worldserver1.entityJoinedWorld(entity, false);
              }
-@@ -441,6 +801,7 @@
+@@ -441,6 +800,7 @@
          }
  
          entity.spawnIn(worldserver1);
@@ -721,7 +720,7 @@
      }
  
      public void tick() {
-@@ -458,6 +819,15 @@
+@@ -458,6 +818,15 @@
  
      }
  
@@ -737,7 +736,7 @@
      public void a(Packet packet, int i) {
          for (int j = 0; j < this.players.size(); ++j) {
              EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
-@@ -549,10 +919,24 @@
+@@ -549,10 +918,24 @@
  
      public void addOp(GameProfile gameprofile) {
          this.operators.add(new OpListEntry(gameprofile, this.server.p()));
@@ -762,7 +761,7 @@
      }
  
      public boolean isWhitelisted(GameProfile gameprofile) {
-@@ -560,7 +944,7 @@
+@@ -560,7 +943,7 @@
      }
  
      public boolean isOp(GameProfile gameprofile) {
@@ -771,7 +770,7 @@
      }
  
      public EntityPlayer getPlayer(String s) {
-@@ -587,6 +971,12 @@
+@@ -587,6 +970,12 @@
          for (int j = 0; j < this.players.size(); ++j) {
              EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
  
@@ -784,7 +783,7 @@
              if (entityplayer != entityhuman && entityplayer.dimension == i) {
                  double d4 = d0 - entityplayer.locX;
                  double d5 = d1 - entityplayer.locY;
-@@ -634,21 +1024,26 @@
+@@ -634,21 +1023,26 @@
      public void reloadWhitelist() {}
  
      public void b(EntityPlayer entityplayer, WorldServer worldserver) {
@@ -816,7 +815,7 @@
          entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
      }
  
-@@ -661,7 +1056,7 @@
+@@ -661,7 +1055,7 @@
      }
  
      public String[] getSeenPlayers() {
@@ -825,7 +824,7 @@
      }
  
      public boolean getHasWhitelist() {
-@@ -711,16 +1106,25 @@
+@@ -711,16 +1105,25 @@
  
      public void v() {
          for (int i = 0; i < this.players.size(); ++i) {
@@ -853,7 +852,7 @@
      }
  
      public void sendMessage(IChatBaseComponent ichatbasecomponent) {
-@@ -754,11 +1158,10 @@
+@@ -754,11 +1157,10 @@
      public void a(int i) {
          this.r = i;
          if (this.server.worldServer != null) {