aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0650-Reset-placed-block-on-exception.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0650-Reset-placed-block-on-exception.patch')
-rw-r--r--patches/server/0650-Reset-placed-block-on-exception.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0650-Reset-placed-block-on-exception.patch b/patches/server/0650-Reset-placed-block-on-exception.patch
new file mode 100644
index 0000000000..c5b6f9f135
--- /dev/null
+++ b/patches/server/0650-Reset-placed-block-on-exception.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Fri, 7 Jan 2022 11:45:15 +0100
+Subject: [PATCH] Reset placed block on exception
+
+
+diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+index cee3f1200af602b5dfd0b27d05eb01826c5bbb1d..7d76cdc59984b156628273c8357485eb10046007 100644
+--- a/src/main/java/net/minecraft/world/item/BlockItem.java
++++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+@@ -77,6 +77,7 @@ public class BlockItem extends Item {
+ if (this instanceof PlaceOnWaterBlockItem || this instanceof SolidBucketItem) {
+ blockstate = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos());
+ }
++ final org.bukkit.block.BlockState oldBlockstate = blockstate != null ? blockstate : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos()); // Paper - Reset placed block on exception
+ // CraftBukkit end
+
+ if (iblockdata == null) {
+@@ -92,8 +93,20 @@ public class BlockItem extends Item {
+
+ if (iblockdata1.is(iblockdata.getBlock())) {
+ iblockdata1 = this.updateBlockStateFromTag(blockposition, world, itemstack, iblockdata1);
++ // Paper start - Reset placed block on exception
++ try {
+ this.updateCustomBlockEntityTag(blockposition, world, entityhuman, itemstack, iblockdata1);
+ BlockItem.updateBlockEntityComponents(world, blockposition, itemstack);
++ } catch (Exception e) {
++ oldBlockstate.update(true, false);
++ if (entityhuman instanceof ServerPlayer player) {
++ org.apache.logging.log4j.LogManager.getLogger().error("Player {} tried placing invalid block", player.getScoreboardName(), e);
++ player.getBukkitEntity().kickPlayer("Packet processing error");
++ return InteractionResult.FAIL;
++ }
++ throw e; // Rethrow exception if not placed by a player
++ }
++ // Paper end - Reset placed block on exception
+ iblockdata1.getBlock().setPlacedBy(world, blockposition, iblockdata1, entityhuman, itemstack);
+ // CraftBukkit start
+ if (blockstate != null) {