SPIGOT-729: Revert the entity slice move

By: Thinkofdeath <thinkofdeath@spigotmc.org>

paper-server/nms-patches/Chunk.patch

@@ -1,5 +1,5 @@
---- /home/matt/mc-dev-private//net/minecraft/server/Chunk.java	2015-03-16 09:47:02.911222177 +0000
-+++ src/main/java/net/minecraft/server/Chunk.java	2015-03-16 09:47:02.911222177 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/Chunk.java	2015-03-22 19:01:20.013879491 +0000
++++ src/main/java/net/minecraft/server/Chunk.java	2015-03-22 19:01:20.013879491 +0000
 @@ -14,6 +14,9 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
@@ -63,15 +63,7 @@
      public Chunk(World world, int i, int j) {
          this.sections = new ChunkSection[16];
          this.e = new byte[256];
-@@ -54,14 +85,25 @@
-         this.locZ = j;
-         this.heightMap = new int[256];
- 
-+        /* CraftBukkit start
-         for (int k = 0; k < this.entitySlices.length; ++k) {
-             this.entitySlices[k] = new EntitySlice(Entity.class);
-         }
-+        // CraftBukkit end */
+@@ -60,8 +91,17 @@
  
          Arrays.fill(this.f, -999);
          Arrays.fill(this.e, (byte) -1);
@@ -89,7 +81,7 @@
      public Chunk(World world, ChunkSnapshot chunksnapshot, int i, int j) {
          this(world, i, j);
          short short0 = 256;
-@@ -529,7 +571,8 @@
+@@ -529,7 +569,8 @@
                      }
                  }
  
@@ -99,7 +91,7 @@
                      block.onPlace(this.world, blockposition, iblockdata);
                  }
  
-@@ -610,7 +653,11 @@
+@@ -610,7 +651,11 @@
          int j = MathHelper.floor(entity.locZ / 16.0D);
  
          if (i != this.locX || j != this.locZ) {
@@ -112,7 +104,7 @@
              entity.die();
          }
  
-@@ -662,7 +709,15 @@
+@@ -662,7 +707,15 @@
      }
  
      public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
@@ -129,7 +121,7 @@
  
          if (tileentity == null) {
              if (chunk_enumtileentitystate == Chunk.EnumTileEntityState.IMMEDIATE) {
-@@ -697,6 +752,13 @@
+@@ -697,6 +750,13 @@
  
              tileentity.D();
              this.tileEntities.put(blockposition, tileentity);
@@ -143,7 +135,7 @@
          }
      }
  
-@@ -740,7 +802,21 @@
+@@ -740,7 +800,21 @@
          }
  
          for (int i = 0; i < this.entitySlices.length; ++i) {
@@ -166,7 +158,7 @@
          }
  
      }
-@@ -798,8 +874,8 @@
+@@ -798,8 +872,8 @@
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();