From 516a8cf5445eee0d28ef844790e6ada26776270c Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 27 Apr 2021 08:51:42 -0700 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#5549) Upstream has released updates that appear 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: 80ece5de Remove old draft API tags 8523fa23 #604: Add Contract annotation to ConfigurationSection dd8edaa7 #603: Specify what velocity changes in javadocs CraftBukkit Changes: 0d86921e SPIGOT-6435: send correcting "PacketPlayOutBlockChange" packet on interact for bisected items --- .../Extend-Player-Interact-cancellation.patch | 7 ++++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch index f03d3d395..d7d0d71cd 100644 --- a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch @@ -52,9 +52,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door. if (iblockdata.getBlock() instanceof BlockDoor) { boolean bottom = iblockdata.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER; - entityplayer.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down())); - } else if (iblockdata.getBlock() instanceof BlockCake) { - entityplayer.getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake +@@ -0,0 +0,0 @@ public class PlayerInteractManager { + + // send a correcting update to the client for the block above as well, this because of replaceable blocks (such as grass, sea grass etc) + entityplayer.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition.up())); + // Paper start - extend Player Interact cancellation // TODO: consider merging this into the extracted method + } else if (iblockdata.getBlock() instanceof BlockStructure) { + entityplayer.playerConnection.sendPacket(new PacketPlayOutCloseWindow()); diff --git a/work/Bukkit b/work/Bukkit index 6bff9d099..80ece5de9 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 6bff9d0996132e9e38679b13853fc0b16a55e33c +Subproject commit 80ece5de932aee4d2c37d13189722b26d45aec5b diff --git a/work/CraftBukkit b/work/CraftBukkit index a8d7c94a5..0d86921e1 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a8d7c94a5b698732029f2f153904cbe943e70e71 +Subproject commit 0d86921e1231b8476ac5eb61e63da1411df658f7