diff --git a/Bukkit b/Bukkit
index 5fa44fc1a..f714a0eb1 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 5fa44fc1a10ad8b3efca62ef0429aadce253c8bc
+Subproject commit f714a0eb175d1619a7847946cdea1056649cd597
diff --git a/CraftBukkit b/CraftBukkit
index b6bb6beb6..935349e3a 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit b6bb6beb63c794a74076b68686ea2298f1f51450
+Subproject commit 935349e3a39e3d39403afef0e750710fdc396d2a
diff --git a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch
index 27d4db0e1..55878d4f7 100644
--- a/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0004-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 9e8464320b6233bac928471a67ff7ff099d3915f Mon Sep 17 00:00:00 2001
+From 150234d1f43979ecc078b2de89bd0d6915ea6d01 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:20:21 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -24,7 +24,7 @@ index e40642f..5ccdb88 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index a07e55e..2751b92 100644
+index 20ee5ca..0951b5a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -198,6 +198,14 @@ public class EntityFishingHook extends Entity {
@@ -75,10 +75,10 @@ index 300573a..6eeb03b 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 2c4e46e..e9c54ee 100644
+index 450ec63..a482db9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1649,6 +1649,14 @@ public abstract class World implements IBlockAccess {
+@@ -1675,6 +1675,14 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < list.size(); ++i) {
              Entity entity1 = (Entity) list.get(i);
  
diff --git a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
index d3f5b8b82..69fdb8e04 100644
--- a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,4 +1,4 @@
-From 3c434790ac382eaa86a47efb3267c4f9db51db46 Mon Sep 17 00:00:00 2001
+From 5f57470879bc673989301bd8e3f055627f51feb5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
@@ -20,11 +20,11 @@ index 375ac89..22d68af 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e9c54ee..7705d0d 100644
+index a482db9..39afaae 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -171,6 +171,7 @@ public abstract class World implements IBlockAccess {
-         this.N.world = (WorldServer) this;
+@@ -197,6 +197,7 @@ public abstract class World implements IBlockAccess {
+         });
          this.getServer().addWorld(this.world);
          // CraftBukkit end
 +        this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
index e0fb0402f..44f311614 100644
--- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From d64749677d07c4a81f77aba15e47315933ec6fb4 Mon Sep 17 00:00:00 2001
+From e53ac67fb4cae8794b1e067379af3c17f209e86d 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
@@ -17,7 +17,7 @@ index 7b7025f..9534bf9 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 916c913..c04490a 100644
+index 863d2c6..bc219b6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -600,7 +600,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -65,10 +65,10 @@ index 9e19dfd..b724586 100644
                                                          biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition);
                                                          if (biomebase_biomemeta == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7705d0d..b4630c4 100644
+index 39afaae..f8737ef 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2653,6 +2653,53 @@ public abstract class World implements IBlockAccess {
+@@ -2679,6 +2679,53 @@ public abstract class World implements IBlockAccess {
          return i;
      }
  
@@ -123,7 +123,7 @@ index 7705d0d..b4630c4 100644
          return this.a(entity.locX, entity.locY, entity.locZ, d0, false);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 250f112..03cdefd 100644
+index 377633e..935810c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1412,6 +1412,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
index 10ab014d3..2e908140b 100644
--- a/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch
@@ -1,4 +1,4 @@
-From 3813aa00f37de429ecf9ce36d58c67d658de18fb Mon Sep 17 00:00:00 2001
+From 16a719ceb18db89f4f6a7709398ee4d2644b9a59 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -187,7 +187,7 @@ index e454622..d01b65a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b4630c4..43f0716 100644
+index f8737ef..d867b82 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -60,7 +60,7 @@ public abstract class World implements IBlockAccess {
@@ -199,7 +199,7 @@ index b4630c4..43f0716 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final List<TileEntity> tileEntityListUnload = Lists.newArrayList();
-@@ -1431,7 +1431,7 @@ public abstract class World implements IBlockAccess {
+@@ -1457,7 +1457,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);
@@ -208,7 +208,7 @@ index b4630c4..43f0716 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1479,7 +1479,7 @@ public abstract class World implements IBlockAccess {
+@@ -1505,7 +1505,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.x()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -217,7 +217,7 @@ index b4630c4..43f0716 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1530,7 +1530,7 @@ public abstract class World implements IBlockAccess {
+@@ -1556,7 +1556,7 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -226,7 +226,7 @@ index b4630c4..43f0716 100644
  
          if (flag && tileentity instanceof ITickable) {
              this.tileEntityListTick.add(tileentity);
-@@ -2003,7 +2003,7 @@ public abstract class World implements IBlockAccess {
+@@ -2029,7 +2029,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);
diff --git a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
index 83112ec48..8b0eb9721 100644
--- a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 94d3a4e3de2a7e6a19a82bfb5a59f69f6fb9c6e1 Mon Sep 17 00:00:00 2001
+From 71726123dd3d7bee5d26197b8359138a1a7ccc9d 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 e6524e9..d898428 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 43f0716..58abd10 100644
+index d867b82..0b5c9fe 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1398,10 +1398,13 @@ public abstract class World implements IBlockAccess {
+@@ -1424,10 +1424,13 @@ public abstract class World implements IBlockAccess {
                      this.g(entity);
                      SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
                  } catch (Throwable throwable1) {
@@ -44,7 +44,7 @@ index 43f0716..58abd10 100644
                  }
              }
  
-@@ -1463,10 +1466,14 @@ public abstract class World implements IBlockAccess {
+@@ -1489,10 +1492,14 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).c();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
diff --git a/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch b/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
index 71fffb7fd..6c79bcbf0 100644
--- a/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
+++ b/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
@@ -1,4 +1,4 @@
-From 229a02dbfcc982bb407cd6044c935c71a9dcd913 Mon Sep 17 00:00:00 2001
+From 15724de66ac3129e18cda0835ebe6142dee6233a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Configurable async light updates
@@ -19,7 +19,7 @@ index 28e3e3c..402ed0a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2f37957..3e9b26f 100644
+index cde4124..5df38be 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -11,6 +11,8 @@ import java.util.Map;
@@ -85,7 +85,7 @@ index 2f37957..3e9b26f 100644
          // Spigot Start
          /*
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 21e7709..1f99e85 100644
+index 83857a6..49288c9 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -46,6 +46,12 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -102,7 +102,7 @@ index 21e7709..1f99e85 100644
              // CraftBukkit start
              this.unloadQueue.add(i, j);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 58abd10..bbdfb3b 100644
+index 0b5c9fe..aa2c65e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -29,6 +29,12 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -126,7 +126,7 @@ index 58abd10..bbdfb3b 100644
  
      public CraftWorld getWorld() {
          return this.world;
-@@ -450,7 +457,7 @@ public abstract class World implements IBlockAccess {
+@@ -476,7 +483,7 @@ public abstract class World implements IBlockAccess {
  
          if (!this.worldProvider.m()) {
              for (i1 = k; i1 <= l; ++i1) {
@@ -135,7 +135,7 @@ index 58abd10..bbdfb3b 100644
              }
          }
  
-@@ -2218,10 +2225,10 @@ public abstract class World implements IBlockAccess {
+@@ -2244,10 +2251,10 @@ public abstract class World implements IBlockAccess {
          boolean flag = false;
  
          if (!this.worldProvider.m()) {
@@ -148,7 +148,7 @@ index 58abd10..bbdfb3b 100644
          return flag;
      }
  
-@@ -2271,10 +2278,15 @@ public abstract class World implements IBlockAccess {
+@@ -2297,10 +2304,15 @@ public abstract class World implements IBlockAccess {
          }
      }
  
@@ -166,7 +166,7 @@ index 58abd10..bbdfb3b 100644
              // CraftBukkit end
              return false;
          } else {
-@@ -2345,6 +2357,17 @@ public abstract class World implements IBlockAccess {
+@@ -2371,6 +2383,17 @@ public abstract class World implements IBlockAccess {
                  i = 0;
              }
  
@@ -184,7 +184,7 @@ index 58abd10..bbdfb3b 100644
              this.methodProfiler.b();
              this.methodProfiler.a("checkedPosition < toCheckCount");
  
-@@ -2399,6 +2422,52 @@ public abstract class World implements IBlockAccess {
+@@ -2425,6 +2448,52 @@ public abstract class World implements IBlockAccess {
          }
      }
  
diff --git a/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch
index 1acb88c64..694bdc4f3 100644
--- a/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch
@@ -1,11 +1,11 @@
-From b65a790b6121f108f31a54f98e6cee3368e00807 Mon Sep 17 00:00:00 2001
+From b371b108ede6a29124b6805ca2992a742d9f4581 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 2 Mar 2016 01:17:06 -0600
 Subject: [PATCH] Configurable end credits when leaving the end
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3506b1b..e68595b 100644
+index 402ed0a..e52b9f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -163,4 +163,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 3506b1b..e68595b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2f1d95b..b32617b 100644
+index df58d6c..45b1ed8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -526,9 +526,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -57,10 +57,10 @@ index 2f1d95b..b32617b 100644
  
      public boolean a(EntityPlayer entityplayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 50add77..38d20b7 100644
+index 08faf3a..5517a2d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -730,7 +730,8 @@ public abstract class PlayerList {
+@@ -729,7 +729,8 @@ public abstract class PlayerList {
              return;
          }
  
diff --git a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
index 497e3fd22..eeeede127 100644
--- a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
@@ -1,14 +1,14 @@
-From 10e9ad852d5f1b56dd3eac57fb68df1f73ae5ef7 Mon Sep 17 00:00:00 2001
+From 3fd336b993bb7f0a3c8ffcdca4c052f536b80a37 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 ee4642f..195bfa5 100644
+index 441d52e..c816b4d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1383,10 +1383,10 @@ public abstract class World implements IBlockAccess {
+@@ -1409,10 +1409,10 @@ public abstract class World implements IBlockAccess {
          guardEntityList = true; // Spigot
          // CraftBukkit start - Use field for loop variable
          int entitiesThisCycle = 0;
@@ -23,7 +23,7 @@ index ee4642f..195bfa5 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1451,9 +1451,7 @@ public abstract class World implements IBlockAccess {
+@@ -1477,9 +1477,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
diff --git a/Spigot-Server-Patches/0057-Timings-v2.patch b/Spigot-Server-Patches/0057-Timings-v2.patch
index e7116a52b..a0a7363ea 100644
--- a/Spigot-Server-Patches/0057-Timings-v2.patch
+++ b/Spigot-Server-Patches/0057-Timings-v2.patch
@@ -1,4 +1,4 @@
-From c12406ab06ef6c05d00b19c2111ac95171712e1d Mon Sep 17 00:00:00 2001
+From 69261900d1655e72db8dfd4c586c463a8d09a1f9 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
@@ -529,7 +529,7 @@ index d898428..f579d28 100644
      private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
      private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 195bfa5..a5eeef8 100644
+index c816b4d..938c05b 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;
@@ -554,7 +554,7 @@ index 195bfa5..a5eeef8 100644
      private boolean guardEntityList; // Spigot
      public static boolean haveWeSilencedAPhysicsCrash;
      public static String blockLocation;
-@@ -181,7 +181,7 @@ public abstract class World implements IBlockAccess {
+@@ -207,7 +207,7 @@ public abstract class World implements IBlockAccess {
          this.getServer().addWorld(this.world);
          // CraftBukkit end
          this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
@@ -563,7 +563,7 @@ index 195bfa5..a5eeef8 100644
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -1353,6 +1353,7 @@ public abstract class World implements IBlockAccess {
+@@ -1379,6 +1379,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.c("remove");
@@ -571,7 +571,7 @@ index 195bfa5..a5eeef8 100644
          this.entityList.removeAll(this.f);
  
          int j;
-@@ -1373,6 +1374,7 @@ public abstract class World implements IBlockAccess {
+@@ -1399,6 +1400,7 @@ public abstract class World implements IBlockAccess {
  
          this.f.clear();
          this.l();
@@ -579,7 +579,7 @@ index 195bfa5..a5eeef8 100644
          this.methodProfiler.c("regular");
  
          CrashReportSystemDetails crashreportsystemdetails1;
-@@ -1382,6 +1384,7 @@ public abstract class World implements IBlockAccess {
+@@ -1408,6 +1410,7 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot
          // CraftBukkit start - Use field for loop variable
@@ -587,7 +587,7 @@ index 195bfa5..a5eeef8 100644
          int entitiesThisCycle = 0;
          // Paper start - Disable tick limiters
          //if (tickPosition < 0) tickPosition = 0;
-@@ -1403,12 +1406,12 @@ public abstract class World implements IBlockAccess {
+@@ -1429,12 +1432,12 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead && !(entity instanceof EntityPlayer)) {
                  try {
@@ -603,7 +603,7 @@ index 195bfa5..a5eeef8 100644
                      System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX + "," + entity.locY + "," + entity.locZ);
                      throwable1.printStackTrace();
                      entity.dead = true;
-@@ -1537,6 +1540,7 @@ public abstract class World implements IBlockAccess {
+@@ -1563,6 +1566,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -611,7 +611,7 @@ index 195bfa5..a5eeef8 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1582,7 +1586,6 @@ public abstract class World implements IBlockAccess {
+@@ -1608,7 +1612,6 @@ public abstract class World implements IBlockAccess {
              entity.ticksLived++;
              entity.inactiveTick();
          } else {
@@ -619,7 +619,7 @@ index 195bfa5..a5eeef8 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1591,6 +1594,7 @@ public abstract class World implements IBlockAccess {
+@@ -1617,6 +1620,7 @@ public abstract class World implements IBlockAccess {
              entity.lastPitch = entity.pitch;
              if (flag && entity.aa) {
                  ++entity.ticksLived;
@@ -627,7 +627,7 @@ index 195bfa5..a5eeef8 100644
                  if (entity.isPassenger()) {
                      entity.aw();
                  } else {
-@@ -1649,8 +1653,6 @@ public abstract class World implements IBlockAccess {
+@@ -1675,8 +1679,6 @@ public abstract class World implements IBlockAccess {
                      }
                  }
              }
diff --git a/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
index 37a657568..b1ab13bcc 100644
--- a/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From b7b272567560e4947474b209356f87aa194beab8 Mon Sep 17 00:00:00 2001
+From 6c700b5912800c45c936e752e85e717383d9ac43 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a5eeef8..1c95c96 100644
+index 938c05b..0066554 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -33,6 +33,8 @@ import org.bukkit.generator.ChunkGenerator;
@@ -31,7 +31,7 @@ index a5eeef8..1c95c96 100644
      public final List<EntityHuman> players = Lists.newArrayList();
      public final List<Entity> j = Lists.newArrayList();
      protected final IntHashMap<Entity> entitiesById = new IntHashMap();
-@@ -1358,19 +1360,20 @@ public abstract class World implements IBlockAccess {
+@@ -1384,19 +1386,20 @@ public abstract class World implements IBlockAccess {
  
          int j;
  
diff --git a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
index c868da052..82188fb13 100644
--- a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 64d63acdd2ab0ce767bffc9c1e7f683d21932ce0 Mon Sep 17 00:00:00 2001
+From 1827b952562ca4c2f14709becc257b10d88be211 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
@@ -50,7 +50,7 @@ index 0000000..9339718
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f0c464b..e0c0a26 100644
+index 6d148d7..b6d84d7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -89,7 +89,7 @@ index f0c464b..e0c0a26 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1f99e85..71ab040 100644
+index 49288c9..9ef6246 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -4,6 +4,7 @@ import java.io.IOException;
@@ -100,7 +100,7 @@ index 1f99e85..71ab040 100644
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -221,7 +222,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -226,7 +227,11 @@ public class ChunkProviderServer implements IChunkProvider {
  
              return chunk;
          } catch (Exception exception) {
@@ -113,7 +113,7 @@ index 1f99e85..71ab040 100644
              return null;
          }
      }
-@@ -230,7 +235,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -235,7 +240,11 @@ public class ChunkProviderServer implements IChunkProvider {
          try {
              this.chunkLoader.b(this.world, chunk);
          } catch (Exception exception) {
@@ -126,7 +126,7 @@ index 1f99e85..71ab040 100644
          }
  
      }
-@@ -240,9 +249,14 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -245,9 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
              chunk.setLastSaved(this.world.getTime());
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
@@ -292,7 +292,7 @@ index 320e52e..d40257f 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1c95c96..75b0d89 100644
+index 0066554..1db5334 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 1c95c96..75b0d89 100644
  import com.google.common.base.Function;
  import com.google.common.base.Objects;
  import com.google.common.base.Predicate;
-@@ -1415,8 +1417,10 @@ public abstract class World implements IBlockAccess {
+@@ -1441,8 +1443,10 @@ public abstract class World implements IBlockAccess {
                  } catch (Throwable throwable1) {
                      // Paper start - Prevent tile entity and entity crashes
                      entity.tickTimer.stopTiming();
@@ -315,7 +315,7 @@ index 1c95c96..75b0d89 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1481,8 +1485,10 @@ public abstract class World implements IBlockAccess {
+@@ -1507,8 +1511,10 @@ public abstract class World implements IBlockAccess {
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
                          tileentity.tickTimer.stopTiming();