From 55c99a89531aaea2fc6ec642a1110546b53a4d07 Mon Sep 17 00:00:00 2001 From: Automated Date: Thu, 3 Sep 2020 16:52:21 -0400 Subject: [PATCH] [Auto] Updated Upstream (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 CraftBukkit Changes: a05df28a7 SPIGOT-6122: Revert "SPIGOT-5794: Do not skip PlayerInteractEvent" --- Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch | 2 +- work/CraftBukkit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch index 3dcb3bfac..dc19aff79 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 { - boolean interactResult = event.useItemInHand() == Event.Result.DENY; + interactResult = event.useItemInHand() == Event.Result.DENY; if (event.useInteractedBlock() == Event.Result.DENY) { + diff --git a/work/CraftBukkit b/work/CraftBukkit index 1d7440332..a05df28a7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 1d74403327235004ff05260d18efe4f573a69883 +Subproject commit a05df28a78f49ee2a49908d64f5140f5934f6bd8