From cac66ac3cb06119c8602f298873ec4cffaeb7d73 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 26 Mar 2023 13:29:41 -0700 Subject: [PATCH] Updated Upstream (CraftBukkit) (#9053) 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 CraftBukkit Changes: f92c94517 SPIGOT-7310: PlayerToggleSneakEvent is not called when a player sneaks while riding an entity b5714184d SPIGOT-7316: Cancelling EntityUnmountEvent does not stop the all effects of the unmounting e237f8c88 SPIGOT-7312: Entity#setVisibleByDefault on player causes skin reset on this player client --- .../Properly-cancel-bed-block-placement.patch | 19 +++++++++++++++++++ work/CraftBukkit | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 patches/server/Properly-cancel-bed-block-placement.patch diff --git a/patches/server/Properly-cancel-bed-block-placement.patch b/patches/server/Properly-cancel-bed-block-placement.patch new file mode 100644 index 0000000000..206515b7e6 --- /dev/null +++ b/patches/server/Properly-cancel-bed-block-placement.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sun, 26 Mar 2023 13:17:41 -0700 +Subject: [PATCH] Properly cancel bed block placement + + +diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java +@@ -0,0 +0,0 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock + + world.setBlock(blockposition1, (BlockState) state.setValue(BedBlock.PART, BedPart.HEAD), 3); + world.blockUpdated(pos, Blocks.AIR); +- state.updateNeighbourShapes(world, pos, 3); ++ // state.updateNeighbourShapes(world, pos, 3); // Paper - shapes will be updated on successful block place + } + + } diff --git a/work/CraftBukkit b/work/CraftBukkit index 93813509b6..f92c945173 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 93813509b6dd3476419a5344b252aa1867960090 +Subproject commit f92c945173a83c754203f372cb0111780c24b540