diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index 57cee63944..953549e2ba 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,4 +1,4 @@
-From d00bbcd15ce5e4a064af3226369114aa8217a4aa Mon Sep 17 00:00:00 2001
+From 42457b83f3c35c1e566f635b53505bc0c53f1eaf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -87,6 +87,42 @@ index 00a530c51c..2947d9ff6a 100644
      public static long a(int i, int j) {
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
+diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
+index b347567699..ceed50d8de 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;
+ 
+ public abstract class EntityCreature extends EntityInsentient {
+ 
++    public org.bukkit.craftbukkit.entity.CraftCreature getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
+     private BlockPosition a;
+     private float b;
+ 
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+index 514c951516..5b33997529 100644
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/server/EntityLiving.java
+@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
+     public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
+     public boolean collides = true;
+     public boolean canPickUpLoot;
++    public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
+ 
+     @Override
+     public float getBukkitYaw() {
+diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
+index 494ce0bc06..04c3756ea3 100644
+--- a/src/main/java/net/minecraft/server/EntityMonster.java
++++ b/src/main/java/net/minecraft/server/EntityMonster.java
+@@ -2,6 +2,7 @@ package net.minecraft.server;
+ 
+ public abstract class EntityMonster extends EntityCreature implements IMonster {
+ 
++    public org.bukkit.craftbukkit.entity.CraftMonster getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftMonster) super.getBukkitEntity(); } // Paper
+     protected EntityMonster(EntityTypes<?> entitytypes, World world) {
+         super(entitytypes, world);
+         this.b_ = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
 index ca2a14d7ac..9a513b4e3a 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index a78c50eaa6..12e7e8c319 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 2efeec193a426c688e23ba85468062130ccf379b Mon Sep 17 00:00:00 2001
+From a91dd246165df6831ea57d4a49074a0ff594d8d5 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 b89ec4252..e4ed7d674 100644
+index d2efcca80a..4812da0dac 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 b89ec4252..e4ed7d674 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 06f10e1e8..43feccef8 100644
+index 06f10e1e84..43feccef8f 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -28,8 +28,16 @@ public class Block implements IMaterial {
@@ -499,7 +499,7 @@ index 06f10e1e8..43feccef8 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 027b7cce9..4e51bd301 100644
+index 027b7cce98..4e51bd301a 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> {
@@ -530,7 +530,7 @@ index 027b7cce9..4e51bd301 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 00cd8d8ce..aabdc9e2f 100644
+index 00cd8d8cea..aabdc9e2f0 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -122,14 +122,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -560,7 +560,7 @@ index 00cd8d8ce..aabdc9e2f 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 88301ee61..5001fd11d 100644
+index 88301ee61e..5001fd11dc 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -607,7 +607,7 @@ index 88301ee61..5001fd11d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 3706e44a3..bf1fffcfe 100644
+index 3706e44a34..bf1fffcfee 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;
@@ -660,7 +660,7 @@ index 3706e44a3..bf1fffcfe 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 19109ee1d..7c238d728 100644
+index 19109ee1dd..7c238d728b 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;
@@ -699,7 +699,7 @@ index 19109ee1d..7c238d728 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 514c95151..d6e9915c1 100644
+index 5b33997529..1722855ac5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -711,7 +711,7 @@ index 514c95151..d6e9915c1 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1984,7 +1984,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1985,7 +1985,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void tick() {
@@ -719,7 +719,7 @@ index 514c95151..d6e9915c1 100644
          super.tick();
          this.cV();
          this.o();
-@@ -2058,9 +2057,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2059,9 +2058,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -729,7 +729,7 @@ index 514c95151..d6e9915c1 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -2136,8 +2133,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2137,8 +2134,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bv = 0;
          }
@@ -738,7 +738,7 @@ index 514c95151..d6e9915c1 100644
      }
  
      protected float e(float f, float f1) {
-@@ -2207,7 +2202,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2208,7 +2203,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -746,7 +746,7 @@ index 514c95151..d6e9915c1 100644
          if (this.isFrozen()) {
              this.bg = false;
              this.bh = 0.0F;
-@@ -2218,7 +2212,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2219,7 +2213,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.e();
          }
@@ -754,7 +754,7 @@ index 514c95151..d6e9915c1 100644
  
          this.world.methodProfiler.e();
          this.world.methodProfiler.a("jump");
-@@ -2243,9 +2236,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2244,9 +2237,7 @@ public abstract class EntityLiving extends Entity {
          this.n();
          AxisAlignedBB axisalignedbb = this.getBoundingBox();
  
@@ -764,7 +764,7 @@ index 514c95151..d6e9915c1 100644
          this.world.methodProfiler.e();
          this.world.methodProfiler.a("push");
          if (this.bw > 0) {
-@@ -2253,9 +2244,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2254,9 +2245,7 @@ public abstract class EntityLiving extends Entity {
              this.a(axisalignedbb, this.getBoundingBox());
          }
  
@@ -775,7 +775,7 @@ index 514c95151..d6e9915c1 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 {
@@ -806,7 +806,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 d453d0c42..83a73b86e 100644
+index d453d0c421..83a73b86ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -960,7 +960,7 @@ index d453d0c42..83a73b86e 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 @@
@@ -1054,7 +1054,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 42e0630e6..5d42cfe81 100644
+index 42e0630e60..5d42cfe81c 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;
@@ -1093,7 +1093,7 @@ index 42e0630e6..5d42cfe81 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 @@
@@ -1116,7 +1116,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 e476d3433..9cef6b9af 100644
+index e476d3433b..9cef6b9af6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1140,7 +1140,7 @@ index e476d3433..9cef6b9af 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> {
@@ -1194,7 +1194,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 9361667c3..0d54513a4 100644
+index 9361667c3b..0d54513a44 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;
@@ -1214,7 +1214,7 @@ index 9361667c3..0d54513a4 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 e1cf1e579..3cb7c1d54 100644
+index e1cf1e579a..3cb7c1d540 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1329,7 +1329,7 @@ index e1cf1e579..3cb7c1d54 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 2c6f6de4c..f032ecab6 100644
+index 2c6f6de4ce..f032ecab64 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1445,7 +1445,7 @@ index 2c6f6de4c..f032ecab6 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c1486a38..ebc2d690b 100644
+index 4c1486a38e..ebc2d690b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1839,12 +1839,31 @@ public final class CraftServer implements Server {
@@ -1482,7 +1482,7 @@ index 4c1486a38..ebc2d690b 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 @@
@@ -1661,7 +1661,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 @@
@@ -1697,7 +1697,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 2d09bb4fa..3dc76f7dd 100644
+index 2d09bb4fab..3dc76f7dd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1708,6 +1708,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1714,7 +1714,7 @@ index 2d09bb4fa..3dc76f7dd 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;
@@ -1790,7 +1790,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 @@
@@ -1872,7 +1872,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;
@@ -1884,7 +1884,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;
@@ -1945,5 +1945,5 @@ index e60fe5a92..f68e42c4d 100644
      }
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
index 49ee56d76e..8bfd1d490e 100644
--- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@@ -1,11 +1,11 @@
-From ebdc4a1bf59df98fa5aababccb2d3c935dde070d Mon Sep 17 00:00:00 2001
+From 2e59841e1c882aa53a07a65e704833c05aaab624 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 ae4a7cb09..f2f45ae4a 100644
+index ae4a7cb097..f2f45ae4a6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -148,4 +148,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index ae4a7cb09..f2f45ae4a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d6e9915c1..574883462 100644
+index 1722855ac5..af595bf2bc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1004,6 +1004,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1005,6 +1005,7 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -30,7 +30,7 @@ index d6e9915c1..574883462 100644
                  if (flag1) {
                      if (flag) {
                          this.world.broadcastEntityEffect(this, (byte) 29);
-@@ -1020,6 +1021,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1021,6 +1022,7 @@ public abstract class EntityLiving extends Entity {
                              b0 = 2;
                          }
  
@@ -38,7 +38,7 @@ index d6e9915c1..574883462 100644
                          this.world.broadcastEntityEffect(this, b0);
                      }
  
-@@ -1043,6 +1045,8 @@ public abstract class EntityLiving extends Entity {
+@@ -1044,6 +1046,8 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -48,7 +48,7 @@ index d6e9915c1..574883462 100644
                      if (!this.e(damagesource)) {
                          SoundEffect soundeffect = this.cs();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 18c55402d..7c676f9f3 100644
+index 18c55402d9..7c676f9f34 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/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index 2061f92851..745936ea79 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 616dad11fb49cd3991ecc2afe098217fb088584a Mon Sep 17 00:00:00 2001
+From dec40f5aae3382fb517071d54d4580616f3dd847 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 4a2d29674..2b25da046 100644
+index 4a2d296746..2b25da0465 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -193,4 +193,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index 4a2d29674..2b25da046 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c7acd0629..27020c7e2 100644
+index c7acd06298..27020c7e29 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2248,6 +2248,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,10 +37,10 @@ index c7acd0629..27020c7e2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 574883462..dd48c6af0 100644
+index af595bf2bc..5363a2c704 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -537,6 +537,7 @@ public abstract class EntityLiving extends Entity {
+@@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity {
          if (nbttagcompound.hasKeyOfType("Team", 8)) {
              String s = nbttagcompound.getString("Team");
              ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s);
@@ -49,5 +49,5 @@ index 574883462..dd48c6af0 100644
  
              if (!flag) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
index e4bcd1cc5c..0679afa45e 100644
--- a/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From a773200d9ab31e884e149a3fd9a108d1e94e618b Mon Sep 17 00:00:00 2001
+From b6b6798de1a749716668630b22eaac2cd1b37a20 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level.
 This method benefits from returning as soon as the desired light level matches.
 
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index b392846aa..c64e6c197 100644
+index b392846aa0..c64e6c197e 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -44,7 +44,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -21,7 +21,7 @@ index b392846aa..c64e6c197 100644
  
              if (i < this.e()) {
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index 723e5c9b4..e24fb1736 100644
+index 723e5c9b44..e24fb17366 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -30,7 +30,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -34,7 +34,7 @@ index 723e5c9b4..e24fb1736 100644
              world.captureTreeGeneration = true;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 0192f9386..334c42d0d 100644
+index 0192f93864..334c42d0d8 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -27,7 +27,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -47,10 +47,10 @@ index 0192f9386..334c42d0d 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 494ce0bc0..f06c34c6f 100644
+index 04c3756ea3..e0e5ba539c 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
-@@ -64,9 +64,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
+@@ -65,9 +65,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
          if (this.world.getBrightness(EnumSkyBlock.SKY, blockposition) > this.random.nextInt(32)) {
              return false;
          } else {
@@ -73,7 +73,7 @@ index 494ce0bc0..f06c34c6f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 9f8f667c1..90aa8641b 100644
+index 5c1bde19c5..2818ded921 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -262,7 +262,7 @@ public class EntityZombie extends EntityMonster {
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 c0cddfc8d6..629d6b4dbb 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 7b31831037d962e312445ec6f9e32fa2506bc4f9 Mon Sep 17 00:00:00 2001
+From 1bc1148cbc2b01c71098683b2b89449f35791f7c 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 dd48c6af0..acd8034e8 100644
+index 5363a2c704..03c6c77a60 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2563,12 +2563,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2564,12 +2564,13 @@ public abstract class EntityLiving extends Entity {
  
      protected void q() {
          if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -23,7 +23,7 @@ index dd48c6af0..acd8034e8 100644
                  world.getServer().getPluginManager().callEvent(event);
  
                  if (event.isCancelled()) {
-@@ -2583,9 +2584,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2584,9 +2585,20 @@ 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 5460d7d1a3..152a094908 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 e6beddb2a3b1f55eb4be581dff0980d66cb1833d Mon Sep 17 00:00:00 2001
+From c9c2f8e5d9b59d0956a2369bd59141ae6e78608b 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 acd8034e8..2448d22ca 100644
+index 03c6c77a60..2d80f4e3e9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -498,7 +498,13 @@ public abstract class EntityLiving extends Entity {
+@@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void a(NBTTagCompound nbttagcompound) {
@@ -23,7 +23,7 @@ index acd8034e8..2448d22ca 100644
          if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
              GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10));
          }
-@@ -890,6 +896,10 @@ public abstract class EntityLiving extends Entity {
+@@ -891,6 +897,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setHealth(float f) {
@@ -34,7 +34,7 @@ index acd8034e8..2448d22ca 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2428,7 +2438,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2429,7 +2439,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -44,7 +44,7 @@ index acd8034e8..2448d22ca 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f716013a..be29f85a0 100644
+index 1f716013ac..be29f85a05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1552,6 +1552,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 4ae09c0201..a60376744a 100644
--- a/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 591dcb3f4be1fc57cd0db75c759f1dc05e13dfed Mon Sep 17 00:00:00 2001
+From d675b7ce31a8ccc14c6a028d6a371bb30ee94fed 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 746e19165..f5c3679b1 100644
+index 2d80f4e3e9..05546ff4db 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -872,10 +872,16 @@ public abstract class EntityLiving extends Entity {
+@@ -873,10 +873,16 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
@@ -28,7 +28,7 @@ index 746e19165..f5c3679b1 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 03dbd21ee8..aed3606bdc 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/0165-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
index 940b1b43c4..8a66e974c4 100644
--- a/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 571ec9d52c313314df1280403dd225517047839b Mon Sep 17 00:00:00 2001
+From 34be4ecc0e2f22775476b1525df4a1d6b66aaa52 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,19 +6,19 @@ 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 b347567699..53b25dd805 100644
+index ceed50d8de..4c2cd41700 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;
- 
+@@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
  public abstract class EntityCreature extends EntityInsentient {
  
+     public org.bukkit.craftbukkit.entity.CraftCreature getBukkitEntity() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper
 +    public BlockPosition movingTarget = null; public BlockPosition getMovingTarget() { return movingTarget; } // Paper
      private BlockPosition a;
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8dbff3c370..3da4bc356a 100644
+index 05546ff4db..422b826d61 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 21f672da5f..996cdd769a 100644
--- a/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 318d09c7f9f441287b02df9a29ba3e710836116c Mon Sep 17 00:00:00 2001
+From 25760dfd08e13f5a5d6b79136baada17f741aace 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
@@ -133,10 +133,10 @@ index 1804a49de9..82e4d2eab6 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.D)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3da4bc356a..f9a76ce27c 100644
+index 422b826d61..fdfef98a3f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -353,7 +353,8 @@ public abstract class EntityLiving extends Entity {
+@@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
                  int j = EntityExperienceOrb.getOrbValue(i);
  
                  i -= j;
diff --git a/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
index 3bca13f453..b23993b4c5 100644
--- a/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 848af308b3d283aef53aa7a3ef34d261219da3bd Mon Sep 17 00:00:00 2001
+From d5dcafc4a816b3bfb10b92beb388035abb19ec63 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 b95f259a9..4991138df 100644
+index b95f259a9a..4991138dfe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -344,4 +344,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index b95f259a9..4991138df 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3955884e1..33683301b 100644
+index 3955884e10..33683301b2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,10 +39,10 @@ index 3955884e1..33683301b 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f9a76ce27..3b4867bfc 100644
+index fdfef98a3f..5da05c0825 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2318,8 +2318,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2319,8 +2319,11 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
@@ -56,5 +56,5 @@ index f9a76ce27..3b4867bfc 100644
                  this.C(entity);
              }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
index 5b512424fe..95cbdd8bfb 100644
--- a/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 224496958b947329bcbcf013a4f9492ba7f109d7 Mon Sep 17 00:00:00 2001
+From 68dd2f248cc7e8ac0f3fc7aae5a87f9520ea8b16 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
@@ -20,10 +20,10 @@ index 578d966401..e9a746f138 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b4867bfc9..b596a616fe 100644
+index 5da05c0825..169ad7619e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -201,6 +201,7 @@ public abstract class EntityLiving extends Entity {
+@@ -202,6 +202,7 @@ public abstract class EntityLiving extends Entity {
          super.a(d0, flag, iblockdata, blockposition);
      }
  
@@ -31,7 +31,7 @@ index 3b4867bfc9..b596a616fe 100644
      public boolean ca() {
          return this.getMonsterType() == EnumMonsterType.UNDEAD;
      }
-@@ -235,7 +236,7 @@ public abstract class EntityLiving extends Entity {
+@@ -236,7 +237,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) {
diff --git a/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
index 6646042213..c792372d53 100644
--- a/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 28232f54f42a2be1d450bb346630809b76fbf87f Mon Sep 17 00:00:00 2001
+From 88f384b7721b3f2139be42f8617ed1dd3177f5a2 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 b596a616fe..999a02cad3 100644
+index 169ad7619e..3236179a45 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 b596a616fe..999a02cad3 100644
  import com.google.common.base.Objects;
  import com.google.common.collect.Maps;
  import java.util.Collection;
-@@ -2047,6 +2048,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2048,6 +2049,13 @@ public abstract class EntityLiving extends Entity {
                  ItemStack itemstack1 = this.getEquipment(enumitemslot);
  
                  if (!ItemStack.matches(itemstack1, itemstack)) {
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 fbc3c6fee7..820ab9538f 100644
--- a/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From a6d780b52c0bbbc8a4b8354539498b66f5793ebe Mon Sep 17 00:00:00 2001
+From 2da4e5b07c352a019dd586f2b22afc864412c9b0 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
@@ -19,10 +19,10 @@ index 3467da7c8e..ddb5ced79d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 999a02cad3..eaab10a146 100644
+index 3236179a45..f4a7db369f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2664,7 +2664,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2665,7 +2665,7 @@ public abstract class EntityLiving extends Entity {
          if (this.isHandRaised() && !this.activeItem.isEmpty()) {
              Item item = this.activeItem.getItem();
  
@@ -31,7 +31,7 @@ index 999a02cad3..eaab10a146 100644
          } else {
              return false;
          }
-@@ -2752,4 +2752,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2753,4 +2753,16 @@ public abstract class EntityLiving extends Entity {
      public boolean df() {
          return true;
      }
diff --git a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
index a27364116c..5e37a1fb70 100644
--- a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 75b301f96c5f5dfddc5bca5671e055cefcb9fcde Mon Sep 17 00:00:00 2001
+From 5cf01d5f61e156c14d59c12c89759e46edee5e3f 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 eaab10a146..4455dc4891 100644
+index f4a7db369f..faa90e9ee5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1247,6 +1247,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1248,6 +1248,12 @@ public abstract class EntityLiving extends Entity {
              this.impulse = true;
              float f1 = MathHelper.sqrt(d0 * d0 + d1 * d1);
  
@@ -22,7 +22,7 @@ index eaab10a146..4455dc4891 100644
              this.motX /= 2.0D;
              this.motZ /= 2.0D;
              this.motX -= d0 / (double) f1 * (double) f;
-@@ -1259,6 +1265,18 @@ public abstract class EntityLiving extends Entity {
+@@ -1260,6 +1266,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 b6d8b4d1bf..a4762d7647 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 b6c38b7516051162057b747eb2cd7af52d49bd86 Mon Sep 17 00:00:00 2001
+From 723172f97310e253f316640feddddbd5a325e8ff 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,7 +6,7 @@ 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 4455dc4891..8be1ba5269 100644
+index faa90e9ee5..a57dcc41bd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index 4455dc4891..8be1ba5269 100644
      protected int bu;
      protected int bv;
      private BlockPosition bL;
-@@ -2653,10 +2653,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2654,10 +2654,12 @@ public abstract class EntityLiving extends Entity {
          return this.activeItem;
      }