From ff60225e011e2568f1af84c41eb69fcb8eff4050 Mon Sep 17 00:00:00 2001 From: Automated 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 --- Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch index dc19aff795..17501ef9de 100644 --- a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Update any tile entity data for this block TileEntity tileentity = this.world.getTileEntity(blockposition); @@ -0,0 +0,0 @@ public class PlayerInteractManager { - interactResult = event.useItemInHand() == Event.Result.DENY; + interactItemStack = itemstack.cloneItemStack(); if (event.useInteractedBlock() == Event.Result.DENY) { + diff --git a/work/Bukkit b/work/Bukkit index 84fcddbf95..91957aa3b9 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 84fcddbf950c5414164ec4767c77b5a113aeca6e +Subproject commit 91957aa3b9b05c0a9243d7c360e284f508d925a8 diff --git a/work/CraftBukkit b/work/CraftBukkit index bf3d720714..6f55306c44 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bf3d7207140a295c35d4024a43cd188824c5a359 +Subproject commit 6f55306c444c3356c4ae394dd708a97451b06fa2