aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0748-Reset-placed-block-on-exception.patch
diff options
context:
space:
mode:
authorTamion <[email protected]>2023-11-04 21:20:13 +0100
committerGitHub <[email protected]>2023-11-04 13:20:13 -0700
commitbffb08c2f99a5527b7357d005cb10ba21cf048d9 (patch)
treec25ad5490b0ede8ce30bc0f23b5e0255eecc0dbc /patches/server/0748-Reset-placed-block-on-exception.patch
parent6592fed511ee2ea17de9e05463579bd1923cf8aa (diff)
downloadPaper-bffb08c2f99a5527b7357d005cb10ba21cf048d9.tar.gz
Paper-bffb08c2f99a5527b7357d005cb10ba21cf048d9.zip
Deprecate Player#boostElytra (#9899)
The Paper method was chosen for deprecation because it was more restrictive in that it has an isGliding check.
Diffstat (limited to 'patches/server/0748-Reset-placed-block-on-exception.patch')
-rw-r--r--patches/server/0748-Reset-placed-block-on-exception.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/server/0748-Reset-placed-block-on-exception.patch b/patches/server/0748-Reset-placed-block-on-exception.patch
new file mode 100644
index 0000000000..308089d693
--- /dev/null
+++ b/patches/server/0748-Reset-placed-block-on-exception.patch
@@ -0,0 +1,38 @@
+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 e68b7a1b03783e4f9de24c5ae8773fc359bd2d37..e581dc10f3c805f7f8b6e4c842092609e7e1a0f8 100644
+--- a/src/main/java/net/minecraft/world/item/BlockItem.java
++++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+@@ -80,6 +80,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
+ // CraftBukkit end
+
+ if (iblockdata == null) {
+@@ -95,7 +96,19 @@ public class BlockItem extends Item {
+
+ if (iblockdata1.is(iblockdata.getBlock())) {
+ iblockdata1 = this.updateBlockStateFromTag(blockposition, world, itemstack, iblockdata1);
++ // Paper start - reset block on exception
++ try {
+ this.updateCustomBlockEntityTag(blockposition, world, entityhuman, itemstack, iblockdata1);
++ } 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
+ iblockdata1.getBlock().setPlacedBy(world, blockposition, iblockdata1, entityhuman, itemstack);
+ // CraftBukkit start
+ if (blockstate != null) {