mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-13 15:38:12 +02:00
9147456fc9
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: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
39 lines
2.5 KiB
Diff
39 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
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) {
|