Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
4543fb40 SPIGOT-4943: Zombie villager conversion player API.

CraftBukkit Changes:
585b2ebd Tweak thresholds for can't keep up message
91ada5c2 SPIGOT-4956: EntityTameEvent not triggered when taming a Cat
9bda4134 SPIGOT-4943: Zombie villager conversion player API.
5a027071 SPIGOT-4947: Allow setting the content on a lectern
09d00e9f SPIGOT-4938: Call EntityPickupItemEvent for dolphins
a278e445 SPIGOT-4948: Lectern.getInventory should return a LecternInventory

Spigot Changes:
4f661b22 Rebuild patches

Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch

@@ -1,11 +1,11 @@
-From 4f0c049efe8ce67de93b3004a3ad46b7013acf47 Mon Sep 17 00:00:00 2001
+From eca7fb22dcc48a6590945d03ae49a7ea0a348046 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a55163a458..341038fc4d 100644
+index a55163a45..341038fc4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -87,4 +87,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index a55163a458..341038fc4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
-index 2e869004c8..8a6856e0fd 100644
+index 2e869004c..8a6856e0f 100644
 --- a/src/main/java/net/minecraft/server/ControllerJump.java
 +++ b/src/main/java/net/minecraft/server/ControllerJump.java
 @@ -13,6 +13,7 @@ public class ControllerJump {
@@ -31,7 +31,7 @@ index 2e869004c8..8a6856e0fd 100644
          this.b.setJumping(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index afa03ce6f2..d49047abc1 100644
+index 113532a97..946e89c49 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -31,6 +31,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -42,7 +42,7 @@ index afa03ce6f2..d49047abc1 100644
      public PathfinderGoalSelector targetSelector;
      private EntityLiving goalTarget;
      private final EntitySenses bz;
-@@ -640,6 +641,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -636,6 +637,12 @@ public abstract class EntityInsentient extends EntityLiving {
          // Spigot Start
          if ( this.fromMobSpawner )
          {
@@ -56,7 +56,7 @@ index afa03ce6f2..d49047abc1 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 040a64471f..a10532b0f8 100644
+index 040a64471..a10532b0f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal {

Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,11 +1,11 @@
-From 224c6085a743293e4c7c8f99d4d13e93a81a7f30 Mon Sep 17 00:00:00 2001
+From 7218767528ebd0d22a17c1a943fa5ba7d52969ec Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 341038fc4d..3e1f4be10f 100644
+index 341038fc4..3e1f4be10 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -92,4 +92,20 @@ public class PaperWorldConfig {
@@ -30,10 +30,10 @@ index 341038fc4d..3e1f4be10f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d49047abc1..265e734af2 100644
+index 946e89c49..e9203479a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -616,11 +616,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -612,11 +612,11 @@ public abstract class EntityInsentient extends EntityLiving {
              if (entityhuman != null) {
                  double d0 = entityhuman.h(this);
  

Spigot-Server-Patches/0018-Player-affects-spawning-API.patch

@@ -1,11 +1,11 @@
-From b2f98146b39d7ce91a285ea261c8fbc958c679db Mon Sep 17 00:00:00 2001
+From 72c98e1673f146a01c9e8ea3ca44cbd2e55e4a8c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ffaeb76d0f..d0713bfcd1 100644
+index e0edea22f..51dcb5ff0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,10 +19,10 @@ index ffaeb76d0f..d0713bfcd1 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 265e734af2..5d830b245d 100644
+index e9203479a..00b51d88b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -613,7 +613,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -609,7 +609,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isPersistent() && !this.I()) {
              EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
  
@@ -32,7 +32,7 @@ index 265e734af2..5d830b245d 100644
  
                  if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index dbbc34d91b..d823c6b6d9 100644
+index dbbc34d91..d823c6b6d 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -106,7 +106,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,7 +45,7 @@ index dbbc34d91b..d823c6b6d9 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e45fd0028b..ffe29917ce 100644
+index 8980de820..6085f293d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1641,7 +1641,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From cce9dd870ff905eb6489514c0a0c31c861449a36 Mon Sep 17 00:00:00 2001
+From 14d985bda1f2c27a8183951306c6e8d345e4126e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f071c3c043..1a75db6f49 100644
+index 2fc8c192b..3a95b0bf8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -101,7 +101,7 @@ index f071c3c043..1a75db6f49 100644
                  while (this.isRunning) {
 -                    long i = (curTime = SystemUtils.getMonotonicMillis()) - this.nextTick;
 -
--                    if (i > 2000L && this.nextTick - this.lastOverloadTime >= 15000L) {
+-                    if (i > 5000L && this.nextTick - this.lastOverloadTime >= 30000L) { // CraftBukkit
 -                        long j = i / 50L;
 -
 -                        if (server.getWarnOnOverload()) // CraftBukkit
@@ -167,7 +167,7 @@ index f071c3c043..1a75db6f49 100644
  
      private void executeModerately() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index def01ae423..ab84c28159 100644
+index 801ea70ac..f9563d038 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1923,6 +1923,17 @@ public final class CraftServer implements Server {
@@ -189,7 +189,7 @@ index def01ae423..ab84c28159 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31deae..6d21c32692 100644
+index be2e31dea..6d21c3269 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@

Spigot-Server-Patches/0122-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From a2ec94269fa6eaf9b16e4810c3f69e1013a3b28f Mon Sep 17 00:00:00 2001
+From 22bcb8cbcdb22075fee2e664ee03e0ebfc0803b1 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
@@ -39,10 +39,10 @@ index 512d18a2b..9ac9d499d 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 0997238df..603ebc504 100644
+index e7bd7e1ea..7471251bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -994,6 +994,14 @@ public class CraftEventFactory {
+@@ -996,6 +996,14 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0128-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,4 +1,4 @@
-From 5fe55301db1583c6c925e28bd39a3672471539ea Mon Sep 17 00:00:00 2001
+From e8f835808fa12ff4f541c2ffb52621c58edd4ae9 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,10 +18,10 @@ index b20813be6..bfba08fb2 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 e67b4cbac..0441afce9 100644
+index 7471251bc..ca6563096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -102,6 +102,7 @@ import org.bukkit.entity.Sheep;
+@@ -103,6 +103,7 @@ import org.bukkit.entity.Sheep;
  import org.bukkit.entity.ThrownExpBottle;
  import org.bukkit.entity.ThrownPotion;
  import org.bukkit.entity.Vehicle;
@@ -29,7 +29,7 @@ index e67b4cbac..0441afce9 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -957,6 +958,17 @@ public class CraftEventFactory {
+@@ -959,6 +960,17 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0131-Add-ProjectileCollideEvent.patch

@@ -1,11 +1,11 @@
-From ffdf77e2218dabe4c5eb150a763d49099e51ffb7 Mon Sep 17 00:00:00 2001
+From 070d33f9ee257c5c8f31c060046e6bcc52367727 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 531bb7f663..bb3ee4320d 100644
+index 531bb7f66..bb3ee4320 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 {
@@ -26,7 +26,7 @@ index 531bb7f663..bb3ee4320d 100644
                      this.a((MovingObjectPosition) object);
                      this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 739e48ec7c..192ee928fa 100644
+index 739e48ec7..192ee928f 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity {
@@ -48,7 +48,7 @@ index 739e48ec7c..192ee928fa 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 15a686cb29..78527f3509 100644
+index 3b10043ba..bdd2a39f8 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 {
@@ -70,7 +70,7 @@ index 15a686cb29..78527f3509 100644
              if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
                  this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index ac62f836d1..bb4679cf76 100644
+index ac62f836d..bb4679cf7 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -102,7 +102,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -92,10 +92,10 @@ index ac62f836d1..bb4679cf76 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 451d4f030c..3ad614b7de 100644
+index ca6563096..8f08c1f44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1098,6 +1098,16 @@ public class CraftEventFactory {
+@@ -1100,6 +1100,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  

Spigot-Server-Patches/0184-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,4 +1,4 @@
-From 423271176bb3c5474c18d7aae55ee6333f9d7f5f Mon Sep 17 00:00:00 2001
+From 8f08b9dfa6889a3b87f06a79c53ef8195facebe5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
@@ -20,10 +20,10 @@ index abc967d3f..2a50d6bab 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8585dcace..1daf7b2c5 100644
+index 8f08c1f44..46531ffbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -513,16 +513,32 @@ public class CraftEventFactory {
+@@ -515,16 +515,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {

Spigot-Server-Patches/0192-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 02fe091f278f2ee5d532ee4e130376c3c7eb6b1a Mon Sep 17 00:00:00 2001
+From 19d8f5f5e055a592c2e9f77df9aa519667028d4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1daf7b2c5..42d82034b 100644
+index 46531ffbe..4e84f4373 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -523,7 +523,7 @@ public class CraftEventFactory {
+@@ -525,7 +525,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start

Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -1,4 +1,4 @@
-From 8f92e4f4bbbdcec6a78f88d11500d04c0bce53cf Mon Sep 17 00:00:00 2001
+From 71dac4714cff48c23f3eed560c4043fddad86f3a 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
@@ -72,7 +72,7 @@ index 670b0b33a..5d58d5e35 100644
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 42d82034b..00879c7f8 100644
+index 4e84f4373..ef62edec4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -49,6 +49,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -83,7 +83,7 @@ index 42d82034b..00879c7f8 100644
  import net.minecraft.server.ItemActionContext;
  import net.minecraft.server.ItemStack;
  import net.minecraft.server.Items;
-@@ -451,16 +452,16 @@ public class CraftEventFactory {
+@@ -453,16 +454,16 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */

Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From ae262d3e841a81051fe5bd507310cd19198e5c9b Mon Sep 17 00:00:00 2001
+From f49837ffa30f83b202f8586e3ba022e4d7f9b29b 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
@@ -168,10 +168,10 @@ index be7c5d174..ba60ece45 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 00879c7f8..ceffcec72 100644
+index ef62edec4..dc83a90a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1239,8 +1239,19 @@ public class CraftEventFactory {
+@@ -1241,8 +1241,19 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch

@@ -1,11 +1,11 @@
-From 6d025cbfd76dcd75563b7a6b2a7e02e4c2eeb7a1 Mon Sep 17 00:00:00 2001
+From 54f403eda4d084c655c020e7a1d549c08c93d011 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 54d025bf7d..e3b1ebe629 100644
+index 54d025bf7..e3b1ebe62 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 54d025bf7d..e3b1ebe629 100644
      protected int j;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb0387..e5a013ffd2 100644
+index ee22bb038..e5a013ffd 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -22,9 +22,18 @@ public interface IEntityAccess {
@@ -41,7 +41,7 @@ index ee22bb0387..e5a013ffd2 100644
              return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
          });
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 452b2b2d28..7019d4ae99 100644
+index 452b2b2d2..7019d4ae9 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -99,7 +99,12 @@ public interface IWorldReader extends IIBlockAccess {
@@ -58,7 +58,7 @@ index 452b2b2d28..7019d4ae99 100644
  
          return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2e..b90cc6652b 100644
+index 59b1e6ce2..b90cc6652 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -126,7 +126,8 @@ public class ItemBlock extends Item {
@@ -72,10 +72,10 @@ index 59b1e6ce2e..b90cc6652b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ceffcec720..b39886c5d0 100644
+index dc83a90a4..063ad48ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1120,6 +1120,14 @@ public class CraftEventFactory {
+@@ -1122,6 +1122,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);

Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch

@@ -1,11 +1,11 @@
-From b083584ee954bf4198666f4e4ed2e68db35fae72 Mon Sep 17 00:00:00 2001
+From 1af0f7f327c7546722f204cba4974633b16ad2a9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index a17738f9ff..d2c2e3cc33 100644
+index a17738f9f..d2c2e3cc3 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index a17738f9ff..d2c2e3cc33 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index cb28914118..5dc967f8ba 100644
+index cb2891411..5dc967f8b 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -39,7 +39,7 @@ public class ItemBucket extends Item {
@@ -67,10 +67,10 @@ index cb28914118..5dc967f8ba 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b39886c5d0..9380b4953f 100644
+index 063ad48ce..8aeba7ca9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -354,6 +354,20 @@ public class CraftEventFactory {
+@@ -356,6 +356,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, EntityHuman who, int clickedX, int clickedY, int clickedZ, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -91,7 +91,7 @@ index b39886c5d0..9380b4953f 100644
          Player player = (who == null) ? null : (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -366,10 +380,10 @@ public class CraftEventFactory {
+@@ -368,10 +382,10 @@ public class CraftEventFactory {
  
          PlayerEvent event = null;
          if (isFilling) {

Spigot-Server-Patches/0303-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 808f26b2ce12112b0dedd5a06f2f4d58bebaedef Mon Sep 17 00:00:00 2001
+From d7323cfecdc1680ee87c785390c081f120b4a12b 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
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 20db76abd7..a148cd437c 100644
+index 20db76abd..a148cd437 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 20db76abd7..a148cd437c 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e1c793aad5..b060a74a1e 100644
+index e1c793aad..b060a74a1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1463,6 +1463,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index e1c793aad5..b060a74a1e 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5c35909eb2..19ba4e059f 100644
+index 5c35909eb..19ba4e059 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -675,7 +675,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 5c35909eb2..19ba4e059f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 87091d8045..77643413f3 100644
+index 87091d804..77643413f 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 87091d8045..77643413f3 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ef24896c0f..2631e9a4ba 100644
+index ef24896c0..2631e9a4b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
@@ -249,7 +249,7 @@ index ef24896c0f..2631e9a4ba 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d46ddba341..0f3be967e5 100644
+index d46ddba34..0f3be967e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -300,7 +300,7 @@ index d46ddba341..0f3be967e5 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09d..9f317ff2e8 100644
+index 73cb64e09..9f317ff2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -806,6 +806,22 @@ public enum CraftSound {
@@ -327,7 +327,7 @@ index 73cb64e09d..9f317ff2e8 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0386452a8d..deacc21873 100644
+index 0386452a8..deacc2187 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -348,10 +348,10 @@ index 0386452a8d..deacc21873 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 9380b4953f..781bf2b42f 100644
+index 8aeba7ca9..ee3251716 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -720,9 +720,16 @@ public class CraftEventFactory {
+@@ -722,9 +722,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -368,7 +368,7 @@ index 9380b4953f..781bf2b42f 100644
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -738,8 +745,15 @@ public class CraftEventFactory {
+@@ -740,8 +747,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -384,7 +384,7 @@ index 9380b4953f..781bf2b42f 100644
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -760,6 +774,31 @@ public class CraftEventFactory {
+@@ -762,6 +776,31 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0322-Add-sun-related-API.patch

@@ -1,14 +1,14 @@
-From 66e8f1ef21328f9fa61ce7f5f9adc8e923cc835a Mon Sep 17 00:00:00 2001
+From 0a7c840cccbb6c84d43432205ed423fb5791ac99 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f1621a9e9d..a8318c88af 100644
+index 11652628b..90923c753 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1330,6 +1330,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return flag;
      }
  
@@ -17,7 +17,7 @@ index f1621a9e9d..a8318c88af 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5220ea0994..70e5552cd9 100644
+index 5220ea099..70e5552cd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -669,6 +669,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -29,7 +29,7 @@ index 5220ea0994..70e5552cd9 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ca41b6d6ba..073400f23f 100644
+index ca41b6d6b..073400f23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -740,6 +740,13 @@ public class CraftWorld implements World {
@@ -47,7 +47,7 @@ index ca41b6d6ba..073400f23f 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154ed..56c233872b 100644
+index 53c2d154e..56c233872 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {

Spigot-Server-Patches/0347-Add-more-Zombie-API.patch

@@ -1,14 +1,14 @@
-From d6295b76112bd2ac3352086abd6c732a6b18a181 Mon Sep 17 00:00:00 2001
+From da0e83eea89b72a5a1ef53bdc263e7d9800a1cc4 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 a8318c88af..ba90cdef16 100644
+index 90923c753..5cc08ca7c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1250,6 +1250,8 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving {
          this.datawatcher.set(EntityInsentient.b, flag ? (byte) (b0 | 2) : (byte) (b0 & -3));
      }
  
@@ -18,7 +18,7 @@ index a8318c88af..ba90cdef16 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 171c1ae4ad..b20fe8e521 100644
+index 171c1ae4a..b20fe8e52 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 171c1ae4ad..b20fe8e521 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 {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 8bcd3fd1e139f791985113e0de85ccab3385bbc7
+Subproject commit 4543fb40291a6cf0b5e19b0057da6c52df479a6a

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 02b466ccc7efa8cb39f3cf417981d96b397b8a72
+Subproject commit 585b2ebdd5acc364d22822837ee5cd06e6ddc4cd

work/Spigot

@@ -1 +1 @@
-Subproject commit 8043ebcb9a2b897a8c4c9dd516373d7cbfbca853
+Subproject commit 4f661b226f7604688a0dc2af5d3f0b8a691370a8