diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
index ada28efc5..f71317063 100644
--- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
@@ -1,11 +1,11 @@
-From 7c509bcd404bfad17b7af2429a193f24af732e57 Mon Sep 17 00:00:00 2001
+From 21e836a230f6b4ef85345c5faf0bd367259b1113 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 098bd3fba8..55d8e74f82 100644
+index 098bd3fba..55d8e74f8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,4 +73,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index 098bd3fba8..55d8e74f82 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2b4a9ffe82..99e501cef4 100644
+index b8761e706..a3af14630 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -20,7 +20,7 @@ public class EntityZombie extends EntityMonster {
+@@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster {
  
      protected static final IAttribute d = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
      private static final UUID b = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
@@ -32,7 +32,7 @@ index 2b4a9ffe82..99e501cef4 100644
      private static final DataWatcherObject<Boolean> bz = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Integer> bA = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
      public static final DataWatcherObject<Boolean> DROWN_CONVERTING = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
-@@ -128,9 +128,9 @@ public class EntityZombie extends EntityMonster {
+@@ -129,9 +129,9 @@ public class EntityZombie extends EntityMonster {
          if (this.world != null && !this.world.isClientSide) {
              AttributeInstance attributeinstance = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
  
diff --git a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
index 667b77c49..4f2b13475 100644
--- a/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0122-Add-EntityZapEvent.patch
@@ -1,14 +1,14 @@
-From 495e69a586a30ceb3ba646e097c743813fd22e29 Mon Sep 17 00:00:00 2001
+From 2ac2035605a6efa20f0fc1f58d30532f611e4036 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 bdbd0371e8..1943a23de4 100644
+index ee5bfd6f0..7136e274a 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
-@@ -168,6 +168,12 @@ public class EntityPig extends EntityAnimal {
+@@ -167,6 +167,12 @@ public class EntityPig extends EntityAnimal {
              entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
          }
  
@@ -22,7 +22,7 @@ index bdbd0371e8..1943a23de4 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 ba0386ad4e..09d12d1fca 100644
+index ba0386ad4..09d12d1fc 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -693,6 +693,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,10 +39,10 @@ index ba0386ad4e..09d12d1fca 100644
          entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
          entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bff5883d77..7abced0442 100644
+index 67076bdd1..31471999c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1014,6 +1014,14 @@ public class CraftEventFactory {
+@@ -1010,6 +1010,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
index 251914c30..8e6144207 100644
--- a/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 0f18a6843159010c7875f1b721be24a86f41e33a Mon Sep 17 00:00:00 2001
+From bbe7c036e9fbe3279d8b87f75ec3a14d8b0c6ced 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
@@ -18,7 +18,7 @@ index 26a3a1d03..a4cd502bc 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 cf1abd187..445f2aef9 100644
+index 31471999c..7cc8b2392 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index cf1abd187..445f2aef9 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -973,6 +974,17 @@ public class CraftEventFactory {
+@@ -969,6 +970,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
index 3d977bb9f..201d95a60 100644
--- a/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 3671296a8a75f9614ab53495d951e3cb1c79cfde Mon Sep 17 00:00:00 2001
+From 0965e2c25b8ba5b58ed14d8f66f96bba8b0c24e2 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 44ea39e3d..fa46dedb8 100644
+index 2b829abac..af0f5cb00 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -48,7 +48,7 @@ index 1a9fee8da..14c439493 100644
  
                  // CraftBukkit start - Fire ProjectileHitEvent
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 74b726937..05fa5cd6a 100644
+index 390f1a24d..758559d35 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -217,7 +217,16 @@ public class EntityFishingHook extends Entity {
@@ -92,10 +92,10 @@ index d1710259c..5f0cb4c33 100644
                  this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
              } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 445f2aef9..a33a9fd79 100644
+index 7cc8b2392..ad9c70b8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1118,6 +1118,16 @@ public class CraftEventFactory {
+@@ -1114,6 +1114,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0160-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0160-Shoulder-Entities-Release-API.patch
index 7f06dd0af..860c51208 100644
--- a/Spigot-Server-Patches/0160-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0160-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From dbb2812c2cff693c54bb46511cfda9dbbd32c26a Mon Sep 17 00:00:00 2001
+From ee388b6d2cceddbde1571cb932310c77d9c6b7af Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
@@ -58,11 +58,11 @@ index c7bb6cbcb..92569f934 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 28ebb73a9..6cce1928a 100644
+index 027063239..37b057c51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
+         getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks);
      }
  
 +    // Paper start
diff --git a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
index 005f02bf5..7e396a3e3 100644
--- a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From d71a3828816ca43e895799b50172617d1911d0ba Mon Sep 17 00:00:00 2001
+From 6e19d4f7a9ee4e7cf3a90226fa3585d9e67a03c2 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8bec59b8fd..7d6a2e8d53 100644
+index 8bec59b8f..7d6a2e8d5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 8bec59b8fd..7d6a2e8d53 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 fc98990379..dcd48d8b3d 100644
+index fc9899037..dcd48d8b3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index fc98990379..dcd48d8b3d 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 89beac63aa..b9793d4cc6 100644
+index 89beac63a..b9793d4cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2025,7 +2025,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 89beac63aa..b9793d4cc6 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 a167843bfb..9e5cd22d7d 100644
+index a167843bf..9e5cd22d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index a167843bfb..9e5cd22d7d 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 55bb019eaa..174fe985f2 100644
+index 55bb019ea..174fe985f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -993,7 +993,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 55bb019eaa..174fe985f2 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 2f24b52ddd..92c7449b76 100644
+index 77efc43a5..81cf5f47a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 2f24b52ddd..92c7449b76 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e610c8aaed..ce35e6bbc2 100644
+index e610c8aae..ce35e6bbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -781,7 +781,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index e610c8aaed..ce35e6bbc2 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 9e6ad82ba5..e84df5dd4e 100644
+index c440ddf53..b095abedb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1259,8 +1259,19 @@ public class CraftEventFactory {
+@@ -1255,8 +1255,19 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch
index 48f30034f..54b27797f 100644
--- a/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0261-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 8132a8e911aa3e09efde964f0900ced2e3b3e858 Mon Sep 17 00:00:00 2001
+From 442793995643e0aae62c4cceaba2664e0c0d6c63 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9241874139..9776a29923 100644
+index 924187413..9776a2992 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 9241874139..9776a29923 100644
      protected int j;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 3328a84792..367b02800a 100644
+index 3328a8479..367b02800 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -30,7 +30,7 @@ index 3328a84792..367b02800a 100644
          return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index c34c635a85..0c8b11bbec 100644
+index c34c635a8..0c8b11bbe 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -136,7 +136,8 @@ public class ItemBlock extends Item {
@@ -44,7 +44,7 @@ index c34c635a85..0c8b11bbec 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 3801b3f21d..092f02cc2f 100644
+index 3801b3f21..092f02cc2 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -46,6 +46,7 @@ public abstract class VoxelShape {
@@ -56,7 +56,7 @@ index 3801b3f21d..092f02cc2f 100644
          return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
      }
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index b8659f703c..c8bd4b7034 100644
+index b8659f703..c8bd4b703 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -33,6 +33,7 @@ public final class VoxelShapes {
@@ -76,7 +76,7 @@ index b8659f703c..c8bd4b7034 100644
          if (operatorboolean.apply(false, false)) {
              throw new IllegalArgumentException();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cacc18ca41..c60279da8f 100644
+index cacc18ca4..c60279da8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -164,6 +164,48 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -129,10 +129,10 @@ index cacc18ca41..c60279da8f 100644
      public BiomeBase getBiome(BlockPosition blockposition) {
          IChunkProvider ichunkprovider = this.getChunkProvider();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e84df5dd4e..379838fd60 100644
+index b095abedb..12aa6f78a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1140,6 +1140,14 @@ public class CraftEventFactory {
+@@ -1136,6 +1136,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0264-EntityTransformedEvent.patch b/Spigot-Server-Patches/0264-EntityTransformedEvent.patch
index 162a3599c..37c0e51f7 100644
--- a/Spigot-Server-Patches/0264-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0264-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From b9384d31cb672ba39234f47c4840290d8e72304c Mon Sep 17 00:00:00 2001
+From 5372197b746a06b86ed5a30e0cc24f048a583a99 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 3b1b0b5992..1363069ff2 100644
+index 3b1b0b599..1363069ff 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -110,6 +110,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 3b1b0b5992..1363069ff2 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a4033a6663..c2ccb85896 100644
+index a4033a666..c2ccb8589 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -711,6 +711,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,10 +29,10 @@ index a4033a6663..c2ccb85896 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 99e501cef4..3542c17e9a 100644
+index a3af14630..832375f27 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -250,6 +250,7 @@ public class EntityZombie extends EntityMonster {
+@@ -252,6 +252,7 @@ public class EntityZombie extends EntityMonster {
                  return;
              }
              // CraftBukkit end
@@ -40,7 +40,7 @@ index 99e501cef4..3542c17e9a 100644
              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.DROWNED); // CraftBukkit - added spawn reason
              this.die();
          }
-@@ -422,6 +423,7 @@ public class EntityZombie extends EntityMonster {
+@@ -424,6 +425,7 @@ public class EntityZombie extends EntityMonster {
              if (CraftEventFactory.callEntityTransformEvent(this, entityzombievillager, EntityTransformEvent.TransformReason.INFECTION).isCancelled()) {
                  return;
              }
@@ -49,11 +49,11 @@ index 99e501cef4..3542c17e9a 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 3609946389..da8a8c8551 100644
+index edb0aa220..d2bd3bb31 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-@@ -170,6 +170,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
-         if (CraftEventFactory.callEntityTransformEvent(this, entityvillager, EntityTransformEvent.TransformReason.CURED).isCancelled()) {
+@@ -172,6 +172,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
+             ((ZombieVillager) getBukkitEntity()).setConversionTime(-1); // SPIGOT-5208: End conversion to stop event spam
              return;
          }
 +        if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityvillager.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.CURED).callEvent()) return; // Paper
diff --git a/Spigot-Server-Patches/0300-Improve-death-events.patch b/Spigot-Server-Patches/0300-Improve-death-events.patch
index 4b5776418..56b8241f5 100644
--- a/Spigot-Server-Patches/0300-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0300-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 593076157c4f7c39906101196b55863615794d3d Mon Sep 17 00:00:00 2001
+From 5cf90690617048b1f94b303f4af011d0add5188f Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -332,7 +332,7 @@ index 2c99a1e9d..e9458dc65 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 02536db14..22aa4767f 100644
+index 5309a4e30..4074100c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -736,9 +736,16 @@ public class CraftEventFactory {
@@ -368,7 +368,7 @@ index 02536db14..22aa4767f 100644
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -776,6 +790,31 @@ public class CraftEventFactory {
+@@ -772,6 +786,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0343-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0343-Add-more-Zombie-API.patch
index b8fe908af..2a22e5bab 100644
--- a/Spigot-Server-Patches/0343-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0343-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 2020a300a9980311b420dff9d43fe18dd424d437 Mon Sep 17 00:00:00 2001
+From f907156715854ece053295bfc0ec77b0b0ee8ea6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 09112a8b0e..d00e99cdba 100644
+index 09112a8b0..d00e99cdb 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1247,6 +1247,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,10 +18,10 @@ index 09112a8b0e..d00e99cdba 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 3542c17e9a..135730156f 100644
+index 832375f27..cdaa7f636 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -32,6 +32,7 @@ public class EntityZombie extends EntityMonster {
+@@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
      private int bF;
      public int drownedConversionTime;
      private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
@@ -29,7 +29,7 @@ index 3542c17e9a..135730156f 100644
  
      public EntityZombie(EntityTypes<? extends EntityZombie> entitytypes, World world) {
          super(entitytypes, world);
-@@ -79,6 +80,7 @@ public class EntityZombie extends EntityMonster {
+@@ -80,6 +81,7 @@ public class EntityZombie extends EntityMonster {
          this.getDataWatcher().register(EntityZombie.DROWN_CONVERTING, false);
      }
  
@@ -37,7 +37,7 @@ index 3542c17e9a..135730156f 100644
      public boolean isDrownConverting() {
          return (Boolean) this.getDataWatcher().get(EntityZombie.DROWN_CONVERTING);
      }
-@@ -211,6 +213,13 @@ public class EntityZombie extends EntityMonster {
+@@ -212,6 +214,13 @@ public class EntityZombie extends EntityMonster {
          this.getDataWatcher().set(EntityZombie.DROWN_CONVERTING, true);
      }
  
@@ -51,7 +51,7 @@ index 3542c17e9a..135730156f 100644
      protected void ea() {
          this.b(EntityTypes.DROWNED);
          this.world.a((EntityHuman) null, 1040, new BlockPosition(this), 0);
-@@ -256,10 +265,17 @@ public class EntityZombie extends EntityMonster {
+@@ -258,10 +267,17 @@ public class EntityZombie extends EntityMonster {
          }
      }
  
@@ -70,7 +70,7 @@ index 3542c17e9a..135730156f 100644
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (super.damageEntity(damagesource, f)) {
-@@ -377,6 +393,7 @@ public class EntityZombie extends EntityMonster {
+@@ -379,6 +395,7 @@ public class EntityZombie extends EntityMonster {
          nbttagcompound.setBoolean("CanBreakDoors", this.ed());
          nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bF : -1);
          nbttagcompound.setInt("DrownedConversionTime", this.isDrownConverting() ? this.drownedConversionTime : -1);
@@ -78,7 +78,7 @@ index 3542c17e9a..135730156f 100644
      }
  
      @Override
-@@ -391,7 +408,11 @@ public class EntityZombie extends EntityMonster {
+@@ -393,7 +410,11 @@ public class EntityZombie extends EntityMonster {
          if (nbttagcompound.hasKeyOfType("DrownedConversionTime", 99) && nbttagcompound.getInt("DrownedConversionTime") > -1) {
              this.startDrownedConversion(nbttagcompound.getInt("DrownedConversionTime"));
          }
@@ -92,7 +92,7 @@ index 3542c17e9a..135730156f 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020e..c4320dbb67 100644
+index 0429cf020..c4320dbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/Spigot-Server-Patches/0362-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0362-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 3194af6fb..48296a275 100644
--- a/Spigot-Server-Patches/0362-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0362-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 760e61084fd5628a70d0bfc31afe90025ba51a5c Mon Sep 17 00:00:00 2001
+From 8dbeb44fd71b383d5ce9432eb6cc52ebccecfe1e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@@ -6,10 +6,10 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 135730156f..5950f3ebd0 100644
+index cdaa7f636..99b2e7815 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -168,6 +168,7 @@ public class EntityZombie extends EntityMonster {
+@@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster {
                      ++this.bF;
                      if (this.bF >= 600) {
                          this.startDrownedConversion(300);
diff --git a/work/Bukkit b/work/Bukkit
index c987938a6..3d9d2efce 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c987938a6a8f595cd71e5e8974c28e13db0c4b0b
+Subproject commit 3d9d2efcea61cf3dba713aa989ae7a362db68458
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7f33c6a2f..3e7b3862c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7f33c6a2f583e6a2ff68b460969c9cf12cb5f89f
+Subproject commit 3e7b3862c7d1c718a47d1d5e54de8e3ea5845bbf