diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index 212de31bf1..a4f1641fc7 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 420dd4451f220787698f1560b1383752c5ed3116 Mon Sep 17 00:00:00 2001
+From db1d411569fb974810f998de3b9cbe7ab4751961 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -1103,7 +1103,7 @@ index 8d54eb3..0f505ed 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8bd0250..78b5a3c 100644
+index 6ba7bbb..c058aa4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1137,7 +1137,7 @@ index 8bd0250..78b5a3c 100644
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -1402,6 +1402,7 @@ public abstract class World implements IBlockAccess {
+@@ -1403,6 +1403,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.c("remove");
@@ -1145,7 +1145,7 @@ index 8bd0250..78b5a3c 100644
          this.entityList.removeAll(this.f);
  
          int j;
-@@ -1422,6 +1423,7 @@ public abstract class World implements IBlockAccess {
+@@ -1423,6 +1424,7 @@ public abstract class World implements IBlockAccess {
  
          this.f.clear();
          this.l();
@@ -1153,7 +1153,7 @@ index 8bd0250..78b5a3c 100644
          this.methodProfiler.c("regular");
  
          CrashReportSystemDetails crashreportsystemdetails1;
-@@ -1431,6 +1433,7 @@ public abstract class World implements IBlockAccess {
+@@ -1432,6 +1434,7 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot
          // CraftBukkit start - Use field for loop variable
@@ -1161,7 +1161,7 @@ index 8bd0250..78b5a3c 100644
          int entitiesThisCycle = 0;
          if (tickPosition < 0) tickPosition = 0;
          for (entityLimiter.initTick();
-@@ -1452,10 +1455,11 @@ public abstract class World implements IBlockAccess {
+@@ -1453,10 +1456,11 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
@@ -1175,7 +1175,7 @@ index 8bd0250..78b5a3c 100644
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
                      entity.appendEntityCrashDetails(crashreportsystemdetails1);
-@@ -1588,6 +1592,7 @@ public abstract class World implements IBlockAccess {
+@@ -1589,6 +1593,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -1183,7 +1183,7 @@ index 8bd0250..78b5a3c 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1640,7 +1645,6 @@ public abstract class World implements IBlockAccess {
+@@ -1641,7 +1646,6 @@ public abstract class World implements IBlockAccess {
              entity.ticksLived++;
              entity.inactiveTick();
          } else {
@@ -1191,7 +1191,7 @@ index 8bd0250..78b5a3c 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1649,6 +1653,7 @@ public abstract class World implements IBlockAccess {
+@@ -1650,6 +1654,7 @@ public abstract class World implements IBlockAccess {
              entity.lastPitch = entity.pitch;
              if (flag && entity.aa) {
                  ++entity.ticksLived;
@@ -1199,7 +1199,7 @@ index 8bd0250..78b5a3c 100644
                  if (entity.isPassenger()) {
                      entity.aw();
                  } else {
-@@ -1707,8 +1712,6 @@ public abstract class World implements IBlockAccess {
+@@ -1708,8 +1713,6 @@ public abstract class World implements IBlockAccess {
                      }
                  }
              }
diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
index 47d5f9f368..797000728e 100644
--- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From 4f369a29323103c01bc354522f86e0a7b13ef229 Mon Sep 17 00:00:00 2001
+From ee86791d8752389218a188dd920ff3eb860dd9f2 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -57,10 +57,10 @@ index bec25e4..30aacc9 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 69aeaca..c8ba375 100644
+index 5e09117..11fbe27 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2742,7 +2742,7 @@ public abstract class World implements IBlockAccess {
+@@ -2743,7 +2743,7 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
  
diff --git a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index cde423cdca..f874653bf7 100644
--- a/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From c594cd00dc7576bf63dab6979473d31ae5b5eb98 Mon Sep 17 00:00:00 2001
+From 4b8c160adcef0468b38af857709f1a50f7a916ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,10 +23,10 @@ index 0f505ed..1f3e89b 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e73c9fb..804b994 100644
+index 0d917b6..536da4d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1467,10 +1467,12 @@ public abstract class World implements IBlockAccess {
+@@ -1468,10 +1468,12 @@ public abstract class World implements IBlockAccess {
                      entity.tickTimer.stopTiming(); // Paper
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
@@ -43,7 +43,7 @@ index e73c9fb..804b994 100644
                  }
              }
  
-@@ -1533,10 +1535,13 @@ public abstract class World implements IBlockAccess {
+@@ -1534,10 +1536,13 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).F_();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
diff --git a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
index c725743038..28be9b2e93 100644
--- a/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
@@ -1,14 +1,14 @@
-From aaf0b0ceee9322dfea65e9a1333add96e1b3f807 Mon Sep 17 00:00:00 2001
+From e74bafb4d5cfe50bad8aeb59969cc28eaa9c8e35 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b80282b..49c20b3 100644
+index cf2bbba..82024a1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1444,10 +1444,10 @@ public abstract class World implements IBlockAccess {
+@@ -1445,10 +1445,10 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - Use field for loop variable
          co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
          int entitiesThisCycle = 0;
@@ -23,7 +23,7 @@ index b80282b..49c20b3 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1513,9 +1513,7 @@ public abstract class World implements IBlockAccess {
+@@ -1514,9 +1514,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
diff --git a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
index 603891932a..7aaf72a158 100644
--- a/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From aae6be8e71297748f3d6edb5070242db78dc4eb2 Mon Sep 17 00:00:00 2001
+From 43bbb17f6b8f99158dace12ff84e61361b1fa421 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@@ -24,7 +24,7 @@ index 40398ca..10eb818 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 49c20b3..6213997 100644
+index 82024a1..0e462ce 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -53,7 +53,7 @@ index 49c20b3..6213997 100644
      public final List<EntityHuman> players = Lists.newArrayList();
      public final List<Entity> j = Lists.newArrayList();
      protected final IntHashMap<Entity> entitiesById = new IntHashMap();
-@@ -1415,20 +1420,20 @@ public abstract class World implements IBlockAccess {
+@@ -1416,20 +1421,20 @@ public abstract class World implements IBlockAccess {
          this.entityList.removeAll(this.f);
  
          int j;
diff --git a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
index 9aad93e759..cd94b05e09 100644
--- a/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 8269ddeb91023116f0bd1c97371332886f1de29f Mon Sep 17 00:00:00 2001
+From 419ba5a439fd82674ae83f25b6b3eecb462bb44e Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6213997..ad6ad75 100644
+index 0e462ce..4cce4bf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -303,7 +303,7 @@ index 6213997..ad6ad75 100644
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Predicate;
-@@ -1475,8 +1477,10 @@ public abstract class World implements IBlockAccess {
+@@ -1476,8 +1478,10 @@ public abstract class World implements IBlockAccess {
                  } catch (Throwable throwable1) {
                      entity.tickTimer.stopTiming();
                      // Paper start - Prevent tile entity and entity crashes
@@ -315,7 +315,7 @@ index 6213997..ad6ad75 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1541,8 +1545,10 @@ public abstract class World implements IBlockAccess {
+@@ -1542,8 +1546,10 @@ public abstract class World implements IBlockAccess {
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
diff --git a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index c7b2f72dc2..a52a6abcc1 100644
--- a/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0091-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From 63f474cc48cbf0fe7d2c67f011d835b607fb03d3 Mon Sep 17 00:00:00 2001
+From 9e70da2e8763df71e160fd166200a81608332ba5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d3770d..8ca33d0 100644
+index 06fb88d..60a55fc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
@@ -227,7 +227,7 @@ index 7d3770d..8ca33d0 100644
  
      public boolean B() {
          return this.J < 4;
-@@ -2037,7 +2046,7 @@ public abstract class World implements IBlockAccess {
+@@ -2038,7 +2047,7 @@ public abstract class World implements IBlockAccess {
      public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
      @Nullable
      public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -236,7 +236,7 @@ index 7d3770d..8ca33d0 100644
              return null;
          } else {
              // CraftBukkit start
-@@ -2078,7 +2087,7 @@ public abstract class World implements IBlockAccess {
+@@ -2079,7 +2088,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@@ -245,7 +245,7 @@ index 7d3770d..8ca33d0 100644
              if (tileentity != null && !tileentity.y()) {
              // CraftBukkit start
              if (captureBlockStates) {
-@@ -2141,7 +2150,7 @@ public abstract class World implements IBlockAccess {
+@@ -2142,7 +2151,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean d(BlockPosition blockposition, boolean flag) {
diff --git a/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch
index 6573d1a9fd..3e44b0cdfb 100644
--- a/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0097-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,14 +1,14 @@
-From c056b9c4109ab49eb510cc72b9f1b984a96ff8bf Mon Sep 17 00:00:00 2001
+From 3c45541cf46e3cf358d90f9ddb03777d75f6afe0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 019b185..2f92c78 100644
+index 6ac16a8..b0f369d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess {
+@@ -1180,6 +1180,7 @@ public abstract class World implements IBlockAccess {
          }
  
          entity.valid = true; // CraftBukkit
@@ -16,7 +16,7 @@ index 019b185..2f92c78 100644
      }
  
      protected void c(Entity entity) {
-@@ -1186,6 +1187,7 @@ public abstract class World implements IBlockAccess {
+@@ -1187,6 +1188,7 @@ public abstract class World implements IBlockAccess {
              ((IWorldAccess) this.u.get(i)).b(entity);
          }
  
diff --git a/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 4e0b0b3106..3e273d8bf0 100644
--- a/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0109-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 90aeca3f878e9215abdb0a3ed06c3b8931dfec5f Mon Sep 17 00:00:00 2001
+From 6e335d3055b2dea8a69d1f3a1bf95ec6fd83d341 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -39,10 +39,10 @@ index 3339985..4cb71eb 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2374a14..841a6c7 100644
+index 0716198..01058a9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3214,8 +3214,9 @@ public abstract class World implements IBlockAccess {
+@@ -3215,8 +3215,9 @@ public abstract class World implements IBlockAccess {
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;
diff --git a/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 023cd8cc49..a7bb7dc80a 100644
--- a/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0111-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,14 +1,14 @@
-From 6d984b9d484fc5c4de82da88f1bbbfcbd9cbed71 Mon Sep 17 00:00:00 2001
+From 4feb279f6e509fd05c7527eb936a534168481a71 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 46b1323..e5a2a65 100644
+index e52791e..0c460b1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3210,6 +3210,7 @@ public abstract class World implements IBlockAccess {
+@@ -3211,6 +3211,7 @@ public abstract class World implements IBlockAccess {
          return this.N;
      }
  
diff --git a/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch
index b29c411f90..45b3ee2235 100644
--- a/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0115-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From a1c15375138e393b0d238cea61db7002e8a2634a Mon Sep 17 00:00:00 2001
+From 71f1926723e388cc370e8b45ee1f65836a99cc61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e5a2a65..948e459 100644
+index 0c460b1..0e2176e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -18,7 +18,7 @@ index e5a2a65..948e459 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
-@@ -1589,7 +1589,7 @@ public abstract class World implements IBlockAccess {
+@@ -1590,7 +1590,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -27,7 +27,7 @@ index e5a2a65..948e459 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1640,7 +1640,7 @@ public abstract class World implements IBlockAccess {
+@@ -1641,7 +1641,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.y()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -36,7 +36,7 @@ index e5a2a65..948e459 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1678,7 +1678,7 @@ public abstract class World implements IBlockAccess {
+@@ -1679,7 +1679,7 @@ public abstract class World implements IBlockAccess {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -45,7 +45,7 @@ index e5a2a65..948e459 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -1698,9 +1698,9 @@ public abstract class World implements IBlockAccess {
+@@ -1699,9 +1699,9 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -57,7 +57,7 @@ index e5a2a65..948e459 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -2134,7 +2134,7 @@ public abstract class World implements IBlockAccess {
+@@ -2135,7 +2135,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);
diff --git a/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ff38abde8b..1cca4cc41b 100644
--- a/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0131-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From f46ff53dca8da104b071ce493c838a1c4f968bbf Mon Sep 17 00:00:00 2001
+From 8889b730cf6740f9b01b57cef074c2ea37bde2df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -48,10 +48,10 @@ index 370cb9c..91af48f 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 948e459..ec03572 100644
+index 0e2176e..b1671b9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1216,6 +1216,7 @@ public abstract class World implements IBlockAccess {
+@@ -1217,6 +1217,7 @@ public abstract class World implements IBlockAccess {
                      {
                          if ( iter.next().trackee == entity )
                          {
diff --git a/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch
index 63ad7baa33..b1784373a5 100644
--- a/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0164-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From aeb95ccd8be310d368a73b4c335d49c82f39a7b8 Mon Sep 17 00:00:00 2001
+From 8c5a12dbae5e897671abbc9e4d47df08d0ed864a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a349f19..cd127e9 100644
+index 498f7f7..caae311 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1783,7 +1783,7 @@ public abstract class World implements IBlockAccess {
+@@ -1784,7 +1784,7 @@ public abstract class World implements IBlockAccess {
              }
  
              int k = MathHelper.floor(entity.locX / 16.0D);
diff --git a/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch
index 6b0c758021..0c7f800f40 100644
--- a/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0184-Add-ProjectileCollideEvent.patch
@@ -1,14 +1,14 @@
-From 231be5bb31831390a32c97235961ec0c7146a123 Mon Sep 17 00:00:00 2001
+From 0c01da83c0c8d228c09d21e987401ebff2666725 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 4b01cc0..76acbcd 100644
+index 4b01cc0..0c8597d 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -190,6 +191,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
+@@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
                  }
              }
  
diff --git a/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch
index da715b9e1b..bbc2fa42d1 100644
--- a/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0185-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 619ac230c0fd18950c98bbc54b0076607ee41af5 Mon Sep 17 00:00:00 2001
+From 7e1c3a4f9105ef80733d87058a6989126b728438 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -18,10 +18,10 @@ index eb32871..a380e61 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d8c8ca0..70140ce 100644
+index cacdafe..fe8a1db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1819,6 +1819,33 @@ public abstract class World implements IBlockAccess {
+@@ -1820,6 +1820,33 @@ public abstract class World implements IBlockAccess {
          return this.a(axisalignedbb, (Entity) null);
      }
  
@@ -55,7 +55,7 @@ index d8c8ca0..70140ce 100644
      public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
          List list = this.getEntities((Entity) null, axisalignedbb);
  
-@@ -2703,7 +2730,7 @@ public abstract class World implements IBlockAccess {
+@@ -2704,7 +2731,7 @@ public abstract class World implements IBlockAccess {
          AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition);
  
          // CraftBukkit start - store default return
diff --git a/work/Bukkit b/work/Bukkit
index 703a1cf835..55fa63e8b9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 703a1cf8353492f83c8b2c1bfd61bc618254c085
+Subproject commit 55fa63e8b9c8f5f315f3d631fad2096a008074df
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0a6a5cb4ad..7f313269d7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0a6a5cb4ad97482e62f612b56199fb85bffc2171
+Subproject commit 7f313269d751d25336a1575c4848d83c150f9517