diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 19d04d97aa..617ac6b110 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 0845d92e6aa2ddf0d67519da4af0713f77e9eed0 Mon Sep 17 00:00:00 2001
+From dfdc0fc72aa42183a2d88cec42f0f08bcb1d474c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3016,10 +3016,10 @@ index 0f42a66a..68b5e1c9 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9c3eeaa9..331bb061 100644
+index 053a24dc..0d41f7db 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1008,12 +1008,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -1011,12 +1011,27 @@ public interface Server extends PluginMessageRecipient {
      // Spigot start
      public class Spigot
      {
diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
index 48cf1aabc7..674b989cfb 100644
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 2a58c6ce3ba2b1829a250a3a66ed0e2ebba73f79 Mon Sep 17 00:00:00 2001
+From 1a2b3bc3c46affceeb6ae0f93d166778eabba78b Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -24,10 +24,10 @@ index 0844862c..bce4ba1b 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d8ce8173..55f4479d 100644
+index 1ad2cba4..b6a2141c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1091,4 +1091,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1094,4 +1094,6 @@ public interface Server extends PluginMessageRecipient {
  
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
index cd3756fd84..5ac111f001 100644
--- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From f6f33b7c1532051a557eb8aba788a930f031243b Mon Sep 17 00:00:00 2001
+From 5573a13dbba10bfedcf8610d255a13293bda79bd Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -26,10 +26,10 @@ index bce4ba1b..70495c15 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 55f4479d..cfc39dbe 100644
+index b6a2141c..94d709f4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1093,4 +1093,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1096,4 +1096,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
index 9f0a524495..15c4eacaca 100644
--- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 7d4cb175afd6bfc4763dd709865dbccd3ace51e7 Mon Sep 17 00:00:00 2001
+From bb52f66da14375368ceff766b8cf92decd2caada Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -27,10 +27,10 @@ index 70495c15..c918d67c 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cfc39dbe..2d9d68fa 100644
+index 94d709f4..96044f4b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1095,4 +1095,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1098,4 +1098,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
index a0b61100fd..94761dcae0 100644
--- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 3d0560ecda8605d6932dd13669f315111764e724 Mon Sep 17 00:00:00 2001
+From 2a6044898ccb64c5c3bd65f556ec5e93834917b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -291,7 +291,7 @@ index c918d67c..01a226d9 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2d9d68fa..e7aab4bb 100644
+index 96044f4b..6c96fc14 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -304,7 +304,7 @@ index 2d9d68fa..e7aab4bb 100644
  /**
   * Represents a server implementation.
   */
-@@ -1104,5 +1107,30 @@ public interface Server extends PluginMessageRecipient {
+@@ -1107,5 +1110,30 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index f0e6bba9c5..f82c3bb1bb 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 52b1fafdb9623e6c1bc74b830a5acf51f70b5ffb Mon Sep 17 00:00:00 2001
+From 59a7ce865916d62eafb935fa6317d16938e28df7 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..4f624e39c
+index 0000000000..4f624e39c7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,125 @@
@@ -137,7 +137,7 @@ index 000000000..4f624e39c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 000000000..0bb63600f
+index 0000000000..0bb63600f3
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,180 @@
@@ -323,7 +323,7 @@ index 000000000..0bb63600f
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..145cb274b
+index 0000000000..145cb274b0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -432,7 +432,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ab2cf6ee..b5795b6d3 100644
+index 5ab2cf6eec..b5795b6d34 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -476,7 +476,7 @@ index 5ab2cf6ee..b5795b6d3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index ffb91b27b..ff110c8e9 100644
+index ffb91b27b0..ff110c8e95 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -29,8 +29,17 @@ public class Block implements IMaterial {
@@ -500,7 +500,7 @@ index ffb91b27b..ff110c8e9 100644
          Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
              protected void rehash(int i) {}
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 5164e5c92..0c2386f5e 100644
+index 5164e5c928..0c2386f5ec 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -531,7 +531,7 @@ index 5164e5c92..0c2386f5e 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0296d3ef0..badfe86b2 100644
+index 0296d3ef02..badfe86b22 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -221,7 +221,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -544,7 +544,7 @@ index 0296d3ef0..badfe86b2 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 90d857105..3a0e52d88 100644
+index 90d8571053..3a0e52d882 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -591,7 +591,7 @@ index 90d857105..3a0e52d88 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 9155aa727..a3d58b5ce 100644
+index 9155aa727d..a3d58b5ce5 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -644,7 +644,7 @@ index 9155aa727..a3d58b5ce 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7a17a4ff9..2ed362791 100644
+index 7a17a4ff99..2ed362791b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -683,10 +683,10 @@ index 7a17a4ff9..2ed362791 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e630d6103..1ee54fa45 100644
+index 3c1adeea65..d7a8a82a6a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
+@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
  import org.bukkit.event.player.PlayerItemConsumeEvent;
  // CraftBukkit end
  
@@ -695,7 +695,7 @@ index e630d6103..1ee54fa45 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1905,7 +1905,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1982,7 +1982,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void tick() {
@@ -703,7 +703,7 @@ index e630d6103..1ee54fa45 100644
          super.tick();
          this.cU();
          this.o();
-@@ -1979,9 +1978,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2056,9 +2055,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -713,7 +713,7 @@ index e630d6103..1ee54fa45 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -2057,8 +2054,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2134,8 +2131,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bv = 0;
          }
@@ -722,7 +722,7 @@ index e630d6103..1ee54fa45 100644
      }
  
      protected float e(float f, float f1) {
-@@ -2128,7 +2123,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2205,7 +2200,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -730,7 +730,7 @@ index e630d6103..1ee54fa45 100644
          if (this.isFrozen()) {
              this.bg = false;
              this.bh = 0.0F;
-@@ -2139,7 +2133,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2216,7 +2210,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.e();
          }
@@ -738,7 +738,7 @@ index e630d6103..1ee54fa45 100644
  
          this.world.methodProfiler.e();
          this.world.methodProfiler.a("jump");
-@@ -2164,9 +2157,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2241,9 +2234,7 @@ public abstract class EntityLiving extends Entity {
          this.n();
          AxisAlignedBB axisalignedbb = this.getBoundingBox();
  
@@ -748,7 +748,7 @@ index e630d6103..1ee54fa45 100644
          this.world.methodProfiler.e();
          this.world.methodProfiler.a("push");
          if (this.bw > 0) {
-@@ -2174,9 +2165,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2251,9 +2242,7 @@ public abstract class EntityLiving extends Entity {
              this.a(axisalignedbb, this.getBoundingBox());
          }
  
@@ -759,7 +759,7 @@ index e630d6103..1ee54fa45 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c4..70c9b1f50 100644
+index ae31935c48..70c9b1f50c 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -790,7 +790,7 @@ index ae31935c4..70c9b1f50 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bcdd9e0fa..590eb507c 100644
+index bcdd9e0fa4..590eb507c0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -944,7 +944,7 @@ index bcdd9e0fa..590eb507c 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ac6d8cc6e..d975c2ccf 100644
+index ac6d8cc6e6..d975c2ccf1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -1038,7 +1038,7 @@ index ac6d8cc6e..d975c2ccf 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6f21b01a8..359aa3997 100644
+index 6f21b01a83..359aa3997a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1077,7 +1077,7 @@ index 6f21b01a8..359aa3997 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 889b32287..69da194f5 100644
+index 889b32287e..69da194f52 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,11 +1,17 @@
@@ -1100,7 +1100,7 @@ index 889b32287..69da194f5 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0156175fb..1e3dd22e5 100644
+index 0156175fb8..1e3dd22e5a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1124,7 +1124,7 @@ index 0156175fb..1e3dd22e5 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935..ee5c2421b 100644
+index a07895935e..ee5c2421bb 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1178,7 +1178,7 @@ index a07895935..ee5c2421b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b992360ac..5b7f6ca84 100644
+index b992360ac2..5b7f6ca84c 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1198,7 +1198,7 @@ index b992360ac..5b7f6ca84 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 330ea4e72..e6b916a5d 100644
+index 330ea4e72e..e6b916a5db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1313,7 +1313,7 @@ index 330ea4e72..e6b916a5d 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 784289c0d..d7f86bf76 100644
+index cecc9bc623..271d75c48d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1429,7 +1429,7 @@ index 784289c0d..d7f86bf76 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 88766d30d..d33f237b7 100644
+index 88766d30d8..d33f237b76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1853,12 +1853,31 @@ public final class CraftServer implements Server {
@@ -1466,7 +1466,7 @@ index 88766d30d..d33f237b7 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 4c8ab2bc9..000000000
+index 4c8ab2bc97..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1645,7 +1645,7 @@ index 4c8ab2bc9..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f0..52a8c48fa 100644
+index 413dd35f06..52a8c48fa4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1681,7 +1681,7 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0a2199b6a..fad258f11 100644
+index 0a2199b6a5..fad258f116 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1665,6 +1665,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1698,7 +1698,7 @@ index 0a2199b6a..fad258f11 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index f11bd7545..93b9134d6 100644
+index f11bd7545f..93b9134d6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1774,7 +1774,7 @@ index f11bd7545..93b9134d6 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 7e7ce9a81..46029ce24 100644
+index 7e7ce9a81b..46029ce246 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1856,7 +1856,7 @@ index 7e7ce9a81..46029ce24 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1868,7 +1868,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e60fe5a92..f68e42c4d 100644
+index e60fe5a920..f68e42c4d4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
index 8df72b258c..d5b90354ec 100644
--- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@@ -1,11 +1,11 @@
-From f3da5a191daee26c438c3fc2d9e804ad66f6b090 Mon Sep 17 00:00:00 2001
+From 615504d69426ef74c5f9e55af1daaa5e37221abd Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3626aa717..be92c1af6 100644
+index 3626aa717d..be92c1af60 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -147,4 +147,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index 3626aa717..be92c1af6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1ee54fa45..43715902e 100644
+index d7a8a82a6a..18dd06980f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -927,6 +927,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1002,6 +1002,7 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -30,7 +30,7 @@ index 1ee54fa45..43715902e 100644
                  if (flag1) {
                      if (flag) {
                          this.world.broadcastEntityEffect(this, (byte) 29);
-@@ -943,6 +944,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1018,6 +1019,7 @@ public abstract class EntityLiving extends Entity {
                              b0 = 2;
                          }
  
@@ -38,7 +38,7 @@ index 1ee54fa45..43715902e 100644
                          this.world.broadcastEntityEffect(this, b0);
                      }
  
-@@ -966,6 +968,8 @@ public abstract class EntityLiving extends Entity {
+@@ -1041,6 +1043,8 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -48,7 +48,7 @@ index 1ee54fa45..43715902e 100644
                      if (!this.e(damagesource)) {
                          SoundEffect soundeffect = this.cr();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 8fdcd52b2..75b21010b 100644
+index 8fdcd52b2f..75b21010b8 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -152,7 +152,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
index 942057dd36..48190a215b 100644
--- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
@@ -1,11 +1,11 @@
-From fbe8dee64d19c1cf190701395ebc83d94de3d92d Mon Sep 17 00:00:00 2001
+From 7cc085846480e5bd02fa7d296150dd91ff2bcaf1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index c0db08f61..32b53bcae 100644
+index 7bd27ad7f9..eafd207467 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -16,6 +16,12 @@ import org.bukkit.entity.HumanEntity;
@@ -21,7 +21,7 @@ index c0db08f61..32b53bcae 100644
  public class TileEntityBeacon extends TileEntityContainer implements IWorldInventory, ITickable {
  
      public static final MobEffectList[][] a = new MobEffectList[][] { { MobEffects.FASTER_MOVEMENT, MobEffects.FASTER_DIG}, { MobEffects.RESISTANCE, MobEffects.JUMP}, { MobEffects.INCREASE_DAMAGE}, { MobEffects.REGENERATION}};
-@@ -130,14 +136,30 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
+@@ -130,14 +136,31 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
      }
  
      private void applyEffect(List list, MobEffectList effects, int i, int b0) {
@@ -43,17 +43,18 @@ index c0db08f61..32b53bcae 100644
 +
              while (iterator.hasNext()) {
                  entityhuman = (EntityHuman) iterator.next();
--                entityhuman.addEffect(new MobEffect(effects, i, b0, true, true));
+-                entityhuman.addEffect(new MobEffect(effects, i, b0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
++
 +                // Paper start - BeaconEffectEvent
 +                BeaconEffectEvent event = new BeaconEffectEvent(block, effect, (Player) entityhuman.getBukkitEntity(), isPrimary);
 +                if (CraftEventFactory.callEvent(event).isCancelled()) continue;
 +                PotionEffect eventEffect = event.getEffect();
-+                entityhuman.getBukkitEntity().addPotionEffect(eventEffect, true);
++                entityhuman.addEffect(new MobEffect(MobEffectList.fromId(eventEffect.getType().getId()), eventEffect.getDuration(), eventEffect.getAmplifier(), true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
 +                // Paper end
              }
          }
      }
-@@ -159,10 +181,10 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
+@@ -159,10 +182,10 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
              int i = getLevel();
              List list = getHumansInRange();
  
diff --git a/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 5a8f1d106e..930eece095 100644
--- a/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,14 +1,14 @@
-From afb80cf6f2d3354fd369ae76af88d5e79a158634 Mon Sep 17 00:00:00 2001
+From 3b79ccc01c8f6b19bf814b9e52598581701b2539 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 382b8028a..2ef1433a7 100644
+index 13100e5d21..1620d9a74e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -97,7 +97,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHealth(double health) {
          health = (float) health;
          if ((health < 0) || (health > getMaxHealth())) {
diff --git a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index 33e6184858..55a54dc449 100644
--- a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From c52630d4105a9443cd2bcea8fc09db888850a3d3 Mon Sep 17 00:00:00 2001
+From e3d93eaaa690554b73b4a0a9ad90f214559284ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6fc3b7621..93486b4b8 100644
+index 6fc3b7621d..93486b4b82 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -192,4 +192,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index 6fc3b7621..93486b4b8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d378f1a9d..e16579116 100644
+index d378f1a9df..e16579116a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2252,6 +2252,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,10 +37,10 @@ index d378f1a9d..e16579116 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 43715902e..f57e0136c 100644
+index 18dd06980f..ab64fb7872 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -536,6 +536,7 @@ public abstract class EntityLiving extends Entity {
+@@ -537,6 +537,7 @@ public abstract class EntityLiving extends Entity {
          if (nbttagcompound.hasKeyOfType("Team", 8)) {
              String s = nbttagcompound.getString("Team");
              ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s);
diff --git a/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index a537c81436..cc4427de41 100644
--- a/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From 6b7551898b105a68759159e515f0f388a65cb9a5 Mon Sep 17 00:00:00 2001
+From 6ed7bec1024ce7726a7feed2ca16e3b80ef3df07 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2ef1433a7..7e3a9eeb2 100644
+index 1620d9a74e..506d0d4e48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -508,4 +508,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -509,4 +509,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public boolean isCollidable() {
          return getHandle().collides;
      }
diff --git a/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
index f9becfbc77..d0e8a4f321 100644
--- a/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
@@ -1,14 +1,14 @@
-From 2269c05cd5259851ea31bd0f141ff8607521007b Mon Sep 17 00:00:00 2001
+From d5dd5cfd1519917997713ba04c795fffefcc22ee Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f57e0136c..a0af21301 100644
+index ab64fb7872..8d06249b6c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2484,12 +2484,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2561,12 +2561,13 @@ public abstract class EntityLiving extends Entity {
  
      protected void q() {
          if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -23,7 +23,7 @@ index f57e0136c..a0af21301 100644
                  world.getServer().getPluginManager().callEvent(event);
  
                  if (event.isCancelled()) {
-@@ -2504,9 +2505,19 @@ public abstract class EntityLiving extends Entity {
+@@ -2581,9 +2582,19 @@ public abstract class EntityLiving extends Entity {
                  itemstack = this.activeItem.a(this.world, this);
              }
  
diff --git a/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index fa61a6bb99..0ea22445d8 100644
--- a/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,14 +1,14 @@
-From 6088c0beba9d12b66a767590c698b54e5e1cecb2 Mon Sep 17 00:00:00 2001
+From f094aeaa1e48c4982f902d3e2cb877c00ae32973 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a0af21301..acf0e0281 100644
+index 8d06249b6c..ed9045f62a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -497,7 +497,13 @@ public abstract class EntityLiving extends Entity {
+@@ -498,7 +498,13 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void a(NBTTagCompound nbttagcompound) {
@@ -23,7 +23,7 @@ index a0af21301..acf0e0281 100644
          if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
              GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10));
          }
-@@ -813,6 +819,10 @@ public abstract class EntityLiving extends Entity {
+@@ -888,6 +894,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setHealth(float f) {
@@ -34,7 +34,7 @@ index a0af21301..acf0e0281 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2349,7 +2359,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2426,7 +2436,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -44,7 +44,7 @@ index a0af21301..acf0e0281 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f6a7f08f9..e71fc971d 100644
+index f6a7f08f96..e71fc971d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1510,6 +1510,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
index 981e469d27..18f12e221f 100644
--- a/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 71bc8c77ee39148ca29785b0433e95fcd59eebf4 Mon Sep 17 00:00:00 2001
+From 1af002cf0a2e3574d4010d2c2f8f860e25163f35 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index acf0e0281..b12c9e461 100644
+index ed9045f62a..1bef317758 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -795,10 +795,16 @@ public abstract class EntityLiving extends Entity {
+@@ -870,10 +870,16 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
@@ -28,7 +28,7 @@ index acf0e0281..b12c9e461 100644
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index bbcc488bd..d886e476b 100644
+index bbcc488bd7..d886e476bf 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
 @@ -65,7 +65,7 @@ public class FoodMetaData {
diff --git a/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
index aacbb22779..7dfee18bd6 100644
--- a/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From 1d5fa873154845f70214ed708125d80ac1ebc22c Mon Sep 17 00:00:00 2001
+From d2f8d17d9f237442ffd96055011475ecaf059e51 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 286382399..2c7677b48 100644
+index 286382399f..2c7677b480 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -152,6 +152,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 286382399..2c7677b48 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 2ec695c9e..abfd9adbd 100644
+index 6c66f7deb5..f14d118427 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -610,6 +610,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,10 +48,10 @@ index 2ec695c9e..abfd9adbd 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1d39ebcfa..2a7f89537 100644
+index 38e07f39c0..5227c15d71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -692,6 +692,14 @@ public class CraftEventFactory {
+@@ -695,6 +695,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
index 41366a0487..57da2beb85 100644
--- a/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From a6304856a1c405b5cc9141933a54229e477fb544 Mon Sep 17 00:00:00 2001
+From f14b1122c926551e727b08ae7e699917c7fec942 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index c8698b2f6..3c888d601 100644
+index c8698b2f67..3c888d6015 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -185,7 +185,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,10 +18,10 @@ index c8698b2f6..3c888d601 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2a7f89537..e32d7fdd1 100644
+index 5227c15d71..01961c5bdd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -46,6 +46,7 @@ import org.bukkit.entity.Player;
+@@ -48,6 +48,7 @@ import org.bukkit.entity.Player;
  import org.bukkit.entity.Projectile;
  import org.bukkit.entity.ThrownExpBottle;
  import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index 2a7f89537..e32d7fdd1 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.block.*;
-@@ -661,6 +662,17 @@ public class CraftEventFactory {
+@@ -664,6 +665,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
index 20d409eb27..4f78170faf 100644
--- a/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 45f4590f8d234db018eac2d5b2b59fd65e3e03fb Mon Sep 17 00:00:00 2001
+From 180ca0b7f1381aea69c6be70f5022c8821be8534 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 75445b00d..4ab875a3d 100644
+index 75445b00dc..4ab875a3d3 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -191,6 +191,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -26,7 +26,7 @@ index 75445b00d..4ab875a3d 100644
                  this.a(movingobjectposition);
                  this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 3e3619d79..58cc4824c 100644
+index 3e3619d79f..58cc4824cf 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -68,6 +68,15 @@ public abstract class EntityFireball extends Entity {
@@ -46,7 +46,7 @@ index 3e3619d79..58cc4824c 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 8630184d4..7440e4a2a 100644
+index 8630184d4b..7440e4a2a9 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -245,6 +245,16 @@ public class EntityFishingHook extends Entity {
@@ -67,7 +67,7 @@ index 8630184d4..7440e4a2a 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index ee402d414..fc8c0cab5 100644
+index ee402d4140..fc8c0cab55 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -144,6 +144,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -87,10 +87,10 @@ index ee402d414..fc8c0cab5 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e32d7fdd1..3f9a66002 100644
+index 01961c5bdd..8df07536f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -797,6 +797,16 @@ public class CraftEventFactory {
+@@ -799,6 +799,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
index 93b4cfc2a8..3264336628 100644
--- a/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From c00538327ef08d018ab2aa559a4a4e332c312005 Mon Sep 17 00:00:00 2001
+From 527982777c9728d51edc763ccf27080487902c05 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index e2e109511..34dcd01de 100644
+index e2e1095118..34dcd01ded 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -18,10 +18,10 @@ index e2e109511..34dcd01de 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b12c9e461..1b2e802ea 100644
+index 1bef317758..c1618f8c36 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
+@@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
      public float aT;
      public float aU;
      public EntityHuman killer;
@@ -31,7 +31,7 @@ index b12c9e461..1b2e802ea 100644
      protected int ticksFarFromPlayer;
      protected float aZ;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 269857960..864ca3cc6 100644
+index 2698579603..864ca3cc6e 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -43,7 +43,7 @@ index 269857960..864ca3cc6 100644
          return this.bQ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index a146a8b45..a19853463 100644
+index a146a8b459..a19853463c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -59,7 +59,7 @@ index a146a8b45..a19853463 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index d5c08aa7c..fe6570c88 100644
+index d5c08aa7cb..fe6570c88d 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,17 +2,24 @@ package net.minecraft.server;
@@ -99,7 +99,7 @@ index d5c08aa7c..fe6570c88 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e02647f80..cdbf769e7 100644
+index e02647f806..cdbf769e7b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
diff --git a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 30f0285f21..38dec7c0b2 100644
--- a/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From abf8017373127327e7990e5f9b1b7c301168a769 Mon Sep 17 00:00:00 2001
+From b381115d1a60cf615a6bc13d874fd8bb29a02c1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index ff110c8e9..d95587c8c 100644
+index ff110c8e95..d95587c8cc 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -473,13 +473,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index ff110c8e9..d95587c8c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e5f064577..e237c5dc1 100644
+index e5f0645774..e237c5dc1a 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index e5f064577..e237c5dc1 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 3c888d601..79d80596d 100644
+index 3c888d6015..79d80596df 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 3c888d601..79d80596d 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7440e4a2a..895254c15 100644
+index 7440e4a2a9..895254c155 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@@ -133,10 +133,10 @@ index 7440e4a2a..895254c15 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.G)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1b2e802ea..3a38f384e 100644
+index c1618f8c36..9f493e43d4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -352,7 +352,8 @@ public abstract class EntityLiving extends Entity {
+@@ -353,7 +353,8 @@ public abstract class EntityLiving extends Entity {
                  int j = EntityExperienceOrb.getOrbValue(i);
  
                  i -= j;
@@ -147,7 +147,7 @@ index 1b2e802ea..3a38f384e 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e0..e73dba09a 100644
+index a5e1939e05..e73dba09a6 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index dcc14aa11..0a9d9fd26 100644
+index fc0c1cc3b2..dd4ecfa883 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index dcc14aa11..0a9d9fd26 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f707..b87096467 100644
+index 4a128f707b..b870964674 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index 4a128f707..b87096467 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 33b508014..e34198e40 100644
+index 33b5080147..e34198e407 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -384,7 +384,7 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index 33b508014..e34198e40 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 998662d9e..6b4eb7f05 100644
+index 998662d9e6..6b4eb7f053 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,7 +221,7 @@ index 998662d9e..6b4eb7f05 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 86848543d..7004f1176 100644
+index 86848543d0..7004f11764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1220,7 +1220,7 @@ public class CraftWorld implements World {
@@ -234,7 +234,7 @@ index 86848543d..7004f1176 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 3a09cab3d4..3302af0e45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -257,5 +257,5 @@ index 3a09cab3d..3302af0e4 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
index ab9ed74570..94425ac9b2 100644
--- a/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 796e78c652161c2fddc66e41eb1342230dbf757b Mon Sep 17 00:00:00 2001
+From d778eb49ecc9e8d5cbfcc4b20f33d607fbc13b00 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5df8b1143..0b748d402 100644
+index 5df8b1143f..0b748d402b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -343,4 +343,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 5df8b1143..0b748d402 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b47bf9738..db7e37aee 100644
+index b47bf97387..db7e37aee6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,6 +168,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,10 +39,10 @@ index b47bf9738..db7e37aee 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3a38f384e..8e45b557e 100644
+index 9f493e43d4..fc0e440798 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2239,8 +2239,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2316,8 +2316,11 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
@@ -56,5 +56,5 @@ index 3a38f384e..8e45b557e 100644
                  this.C(entity);
              }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
index c430af6045..345adb220a 100644
--- a/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 8cf96bc08605c275cb7d93a65c94983dcb8e6a37 Mon Sep 17 00:00:00 2001
+From 0628af2631258500bd906bbaf21bcaca89c8de03 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 52a1036fd..26171b343 100644
+index 52a1036fdb..26171b3430 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -764,5 +764,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,10 +20,10 @@ index 52a1036fd..26171b343 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8e45b557e..f4a766800 100644
+index fc0e440798..38baecd862 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -200,6 +200,7 @@ public abstract class EntityLiving extends Entity {
+@@ -201,6 +201,7 @@ public abstract class EntityLiving extends Entity {
          super.a(d0, flag, iblockdata, blockposition);
      }
  
@@ -31,7 +31,7 @@ index 8e45b557e..f4a766800 100644
      public boolean bZ() {
          return this.getMonsterType() == EnumMonsterType.UNDEAD;
      }
-@@ -234,7 +235,7 @@ public abstract class EntityLiving extends Entity {
+@@ -235,7 +236,7 @@ public abstract class EntityLiving extends Entity {
  
          if (this.isAlive()) {
              if (this.a(TagsFluid.a) && this.world.getType(new BlockPosition(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ)).getBlock() != Blocks.BUBBLE_COLUMN) {
@@ -41,5 +41,5 @@ index 8e45b557e..f4a766800 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
index 23113153e2..747f524ab0 100644
--- a/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
@@ -1,14 +1,14 @@
-From 136175b47766a1f0cf576459703e71bd94a72d5f Mon Sep 17 00:00:00 2001
+From 2ad5b2c13862575d1cf7a73a68e117b5729be51f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7e3a9eeb2..487bb9ece 100644
+index 506d0d4e48..460a050cce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -254,6 +254,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -255,6 +255,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
      }
  
diff --git a/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
index bf55875be5..61455b7f6c 100644
--- a/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 3ffcf52cb5875fb50fbb430a6f295b4aa78a7c4e Mon Sep 17 00:00:00 2001
+From c181940c4734bff813360c6c3109e3c680107d55 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f4a766800..401410b87 100644
+index 38baecd862..2f325f695e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index f4a766800..401410b87 100644
  import com.google.common.base.Objects;
  import com.google.common.collect.Maps;
  import java.util.Collection;
-@@ -1968,6 +1969,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2045,6 +2046,13 @@ public abstract class EntityLiving extends Entity {
                  ItemStack itemstack1 = this.getEquipment(enumitemslot);
  
                  if (!ItemStack.matches(itemstack1, itemstack)) {
@@ -30,7 +30,7 @@ index f4a766800..401410b87 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index cdf3a3ba4..be5d0bf89 100644
+index cdf3a3ba4a..be5d0bf898 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
diff --git a/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
index 42b955e636..e66dcad16d 100644
--- a/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 5ddbd4a96ffef506dc4eb009c32e3a7b74e35559 Mon Sep 17 00:00:00 2001
+From 1fe88e14503474a32459e6777e8f2e8096c85adf Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f1db4becd..ef4bfb480 100644
+index f1db4becde..ef4bfb480c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -408,4 +408,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index f1db4becd..ef4bfb480 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 401410b87..1932d38a8 100644
+index 2f325f695e..ab3246ee02 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2584,7 +2584,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2661,7 +2661,7 @@ public abstract class EntityLiving extends Entity {
          if (this.isHandRaised() && !this.activeItem.isEmpty()) {
              Item item = this.activeItem.getItem();
  
@@ -31,7 +31,7 @@ index 401410b87..1932d38a8 100644
          } else {
              return false;
          }
-@@ -2672,4 +2672,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2749,4 +2749,16 @@ public abstract class EntityLiving extends Entity {
      public boolean de() {
          return true;
      }
@@ -49,10 +49,10 @@ index 401410b87..1932d38a8 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 487bb9ece..0237ac769 100644
+index 460a050cce..35ba95e0f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -529,5 +529,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -530,5 +530,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(int arrows) {
          getHandle().setArrowCount(arrows);
      }
diff --git a/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 5c7f5fee15..e5da2e7956 100644
--- a/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From d48edab130718f13d7a03c11d90dbe20fd5f5666 Mon Sep 17 00:00:00 2001
+From ce9ae41f9c1a58dfb36d50e022a54f9a693baf9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index c2bc8060a..1ae967d1c 100644
+index c2bc8060ac..1ae967d1c0 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -160,7 +160,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index c2bc8060a..1ae967d1c 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 4aa3b6249..c8fc18045 100644
+index 4aa3b6249f..c8fc180458 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -57,6 +57,7 @@ public class ItemBow extends Item {
@@ -58,10 +58,10 @@ index 4aa3b6249..c8fc18045 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3f9a66002..77973c1e8 100644
+index 8df07536f8..28b156e439 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -241,7 +241,7 @@ public class CraftEventFactory {
+@@ -244,7 +244,7 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */
@@ -70,7 +70,7 @@ index 3f9a66002..77973c1e8 100644
          LivingEntity shooter = (LivingEntity) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
          Arrow arrow = (Arrow) entityArrow.getBukkitEntity();
-@@ -250,7 +250,7 @@ public class CraftEventFactory {
+@@ -253,7 +253,7 @@ public class CraftEventFactory {
              itemInHand = null;
          }
  
diff --git a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
index 6f7fca6eda..056fabf378 100644
--- a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From fc3410f5aeb5f6b421aed828b1086bfc7729d5bf Mon Sep 17 00:00:00 2001
+From be0ea88947f6c5be87e3dfd4c20665785d6858db Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,10 +6,10 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1932d38a8..1d7b9c525 100644
+index ab3246ee02..f67b4ca353 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1168,6 +1168,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1245,6 +1245,12 @@ public abstract class EntityLiving extends Entity {
              this.impulse = true;
              float f1 = MathHelper.sqrt(d0 * d0 + d1 * d1);
  
@@ -22,7 +22,7 @@ index 1932d38a8..1d7b9c525 100644
              this.motX /= 2.0D;
              this.motZ /= 2.0D;
              this.motX -= d0 / (double) f1 * (double) f;
-@@ -1180,6 +1186,18 @@ public abstract class EntityLiving extends Entity {
+@@ -1257,6 +1263,18 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
diff --git a/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
index 8cbbe2e413..8af5b0a0eb 100644
--- a/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From ea25e60618789c9bbcd9435a8865985fa6d00b94 Mon Sep 17 00:00:00 2001
+From 42f348c4866235a751a95a6c69abeaaf826dad17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1d7b9c525..6036915a8 100644
+index f67b4ca353..cda8151487 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2569,14 +2569,17 @@ public abstract class EntityLiving extends Entity {
+@@ -2646,14 +2646,17 @@ public abstract class EntityLiving extends Entity {
  
      }
  
@@ -28,10 +28,10 @@ index 1d7b9c525..6036915a8 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cW() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0237ac769..8b3659c82 100644
+index 35ba95e0f5..0975181e06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -539,5 +539,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -540,5 +540,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
diff --git a/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 0a28b6107e..a9ecbf09ff 100644
--- a/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From c8a8053717442079fad265a3d1aa23ae1c39a794 Mon Sep 17 00:00:00 2001
+From 82b68d951b4bd0d4016c4ff31929c87fe6b7365c Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 77973c1e8..c129e8629 100644
+index 28b156e439..8ac599b7a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -821,7 +821,7 @@ public class CraftEventFactory {
+@@ -823,7 +823,7 @@ public class CraftEventFactory {
              hitBlock = entity.getBukkitEntity().getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
          }
  
diff --git a/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
index 4025f6190f..cbd24bee3e 100644
--- a/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From d3cbb67dbd5fb2332756a6fd14f59ce70125147a Mon Sep 17 00:00:00 2001
+From a4b348249773be2b2366d73f8e54d35aa39c2e21 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f31524eb0..2612d4207 100644
+index f31524eb02..2612d4207f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -886,7 +886,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index f31524eb0..2612d4207 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a766a1467..cbf663573 100644
+index 4aba5716ce..d84bb0e40c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index a766a1467..cbf663573 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c91caf578..59dc239b8 100644
+index 5db6e07640..99c638857b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -343,7 +343,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,7 +110,7 @@ index c91caf578..59dc239b8 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 067f7b990..97b315bca 100644
+index 067f7b9908..97b315bca0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2038,7 +2038,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -123,7 +123,7 @@ index 067f7b990..97b315bca 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 879780c5b..907f0232b 100644
+index 879780c5b1..907f0232bf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -422,7 +422,7 @@ public abstract class PlayerList {
@@ -136,7 +136,7 @@ index 879780c5b..907f0232b 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 4b9ecb4a6..b602a5d1b 100644
+index 4b9ecb4a62..b602a5d1b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,8 +402,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 4b9ecb4a6..b602a5d1b 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 60bc6d331..b25980027 100644
+index 60bc6d3316..b25980027b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -687,7 +687,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index 60bc6d331..b25980027 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c129e8629..81ba63bab 100644
+index 8ac599b7a2..cf398cd250 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -911,8 +911,19 @@ public class CraftEventFactory {
+@@ -913,8 +913,19 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/work/Bukkit b/work/Bukkit
index 0bfac352ec..ac92f0355a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0bfac352ece5fd5bca7b8476eb233579a0772fab
+Subproject commit ac92f0355a7bf319d51b78837f8e7a3889b6c549
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c1d9f94223..7c0f69e449 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c1d9f942238443b0b3074b49e2c5f57700f8af3c
+Subproject commit 7c0f69e449b94547f95daa5c09407dd3f4a6fd52
diff --git a/work/Spigot b/work/Spigot
index 83d9d09afb..751edf9136 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 83d9d09afb65204de4f6050c4033d482dd2a0d6a
+Subproject commit 751edf9136cc98e37842b9dc43d4d119452c5433