Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-27 22:17:38 +02:00
Code Issues Projects Releases Wiki Activity

Fix desync of honeycomb when the event is canceled (#8713)

Browse Source
This commit is contained in:
Lulu13022002 2023-02-11 18:14:03 +01:00 committed by GitHub
parent 7e7e6b4bab
commit bd77b78e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch
View File

@ -111,15 +111,18 @@ index e0c3aa1285709a40ff0ea8c1d74d43d2b341aecc..f4fc8ff3981555e4b560289248a9b02a
Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition); Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition);
world.setBlock(blockposition, iblockdata1, 2); world.setBlock(blockposition, iblockdata1, 2);
diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java
index 68a8d3b16d49c10fc9834f32009095d35c9c55a8..1f8b7b50c6aa24778d87821ae2ff4d019d176082 100644 index 68a8d3b16d49c10fc9834f32009095d35c9c55a8..f0b720eafc538f97d788f89bd2f2e9da0ff84a19 100644
--- a/src/main/java/net/minecraft/world/item/HoneycombItem.java --- a/src/main/java/net/minecraft/world/item/HoneycombItem.java
+++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java +++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java
@@ -37,6 +37,11 @@ public class HoneycombItem extends Item { @@ -37,6 +37,14 @@ public class HoneycombItem extends Item {
return getWaxed(blockState).map((state) -> { return getWaxed(blockState).map((state) -> {
Player player = context.getPlayer(); Player player = context.getPlayer();
ItemStack itemStack = context.getItemInHand(); ItemStack itemStack = context.getItemInHand();
+ // Paper start - EntityChangeBlockEvent + // Paper start - EntityChangeBlockEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state).isCancelled()) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state).isCancelled()) {
+ if (!player.isCreative()) {
+ player.containerMenu.sendAllDataToRemote();
+ }
+ return InteractionResult.PASS; + return InteractionResult.PASS;
+ } + }
+ // Paper end + // Paper end