From 5b352d9b336995dc8da2a16c81083f61aaa10fb3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Sep 2020 18:42:19 -0400
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit)

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:
91957aa3 #550: Add getHandlerList into ArrowBodyCountChangeEvent
30dc3e37 Update deprecation message for PotionMeta.setMainEffect

CraftBukkit Changes:
6f55306c4 SPIGOT-5794: Only skip interact event if position, hand and itemstack are equal
---
 .../0193-Extend-Player-Interact-cancellation.patch          | 6 +++---
 work/Bukkit                                                 | 2 +-
 work/CraftBukkit                                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
index 7ddec9164..629f8fd75 100644
--- a/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
@@ -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 ee59d76d31b8b8cfd39d612b1e6040891f2256f4..36cf4c332054a350ae193637f895a45a8b04da9b 100644
+index d9ee5f7fd6a405547da0b162f11886d7b96dd622..0aa9b3a0d2aec8072fe32e43ed16946f22b29fab 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -148,6 +148,11 @@ public class PlayerInteractManager {
@@ -28,8 +28,8 @@ index ee59d76d31b8b8cfd39d612b1e6040891f2256f4..36cf4c332054a350ae193637f895a45a
                      this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
                      // Update any tile entity data for this block
                      TileEntity tileentity = this.world.getTileEntity(blockposition);
-@@ -446,13 +451,32 @@ public class PlayerInteractManager {
-         interactResult = event.useItemInHand() == Event.Result.DENY;
+@@ -452,13 +457,32 @@ public class PlayerInteractManager {
+         interactItemStack = itemstack.cloneItemStack();
  
          if (event.useInteractedBlock() == Event.Result.DENY) {
 +
diff --git a/work/Bukkit b/work/Bukkit
index 84fcddbf9..91957aa3b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 84fcddbf950c5414164ec4767c77b5a113aeca6e
+Subproject commit 91957aa3b9b05c0a9243d7c360e284f508d925a8
diff --git a/work/CraftBukkit b/work/CraftBukkit
index bf3d72071..6f55306c4 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit bf3d7207140a295c35d4024a43cd188824c5a359
+Subproject commit 6f55306c444c3356c4ae394dd708a97451b06fa2