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:
6de6ac4a BlockDropItemEvent should refer to getBlockState rather than getBlockData
2b555a75 Fix BlockDropItemEvent for Skulls and Shulker Boxes

CraftBukkit Changes:
f17d591c Fix BlockDropItemEvent for Skulls and Shulker Boxes

Spigot Changes:
f56e2e78 Catch async recipe add

Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From 11b37982d9590009a29a4833d0ea71f787a27836 Mon Sep 17 00:00:00 2001
+From 2aca511c4110fde82bf8492a8ae4d9f82cd78c58 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
@@ -186,10 +186,10 @@ index bf061cf06..55f978768 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 32b0e7965..5b8ddc76e 100644
+index a165378ac..50a1239c2 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-@@ -390,7 +390,7 @@ public class PlayerInteractManager {
+@@ -399,7 +399,7 @@ public class PlayerInteractManager {
  
                  // CraftBukkit start - Drop event experience
                  if (flag && event != null) {

Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch

@@ -1,4 +1,4 @@
-From 72636b631f801d3c4b26d04d911d471581daceb7 Mon Sep 17 00:00:00 2001
+From 0ef21ee5503aff8e8f71127f438bf2d91b10e662 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index aa7780eff..23223e89d 100644
+index 50a1239c2..ef0b03795 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -111,6 +111,11 @@ public class PlayerInteractManager {
@@ -28,7 +28,7 @@ index aa7780eff..23223e89d 100644
              // Update any tile entity data for this block
              TileEntity tileentity = this.world.getTileEntity(blockposition);
              if (tileentity != null) {
-@@ -465,7 +470,25 @@ public class PlayerInteractManager {
+@@ -474,7 +479,25 @@ public class PlayerInteractManager {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
              } else if (iblockdata.getBlock() instanceof BlockCake) {
                  ((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
@@ -55,5 +55,5 @@ index aa7780eff..23223e89d 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.20.0
+2.20.1
 

Spigot-Server-Patches/0397-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch

@@ -1,4 +1,4 @@
-From 1469b30d1f9e32a427637c90392ce79c226ce8d9 Mon Sep 17 00:00:00 2001
+From 7c192da4b6d660d3996c2eef25e28c2903f39fd1 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@@ -13,10 +13,10 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 1d76c4c99..be6cd6adf 100644
+index cf5392311..843644933 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-@@ -375,10 +375,11 @@ public class PlayerInteractManager {
+@@ -384,10 +384,11 @@ public class PlayerInteractManager {
                      ItemStack itemstack1 = this.player.getItemInMainHand();
                      boolean flag1 = this.player.hasBlock(iblockdata);
  

work/Bukkit

@@ -1 +1 @@
-Subproject commit 5b680f0b3229afd88011315696d19fc1c04d32e6
+Subproject commit 6de6ac4a8b5e3015be6105e96ff579508b9a6fc0

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 5932f8a7dae0fbf852592579edfa277ab260752a
+Subproject commit f17d591cc9a57323b254d3981c8944e1c05bf37f

work/Spigot

@@ -1 +1 @@
-Subproject commit 19c3c5a51d345122f722bc1edf2a703dc40cee3c
+Subproject commit f56e2e787f425025af0d7410ff4cdb4f8edf7f3b