aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch')
-rw-r--r--patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
new file mode 100644
index 0000000000..a745081446
--- /dev/null
+++ b/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Pierpaolo Coletta <[email protected]>
+Date: Sat, 30 Mar 2024 21:06:10 +0100
+Subject: [PATCH] Fix creation of invalid block entity during world generation
+
+
+diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+index a59eece9c7a8c33cb8ce963906e993c3462684fb..333a02e08cccf5cb0efa2076582cbd69e95ff0c0 100644
+--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
++++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+@@ -339,6 +339,7 @@ public class WorldGenRegion implements WorldGenLevel {
+ ichunkaccess.removeBlockEntity(pos);
+ }
+ } else {
++ ichunkaccess.removeBlockEntity(pos); // Paper - Clear the block entity before setting up a DUMMY block entity
+ CompoundTag nbttagcompound = new CompoundTag();
+
+ nbttagcompound.putInt("x", pos.getX());
+diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+index 744db9eec4f7bdeb32f83300960a7fce63b393d8..8de6ad8b131061b2dae440dff71e2e6e7af2de39 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
++++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -1071,9 +1071,14 @@ public class LevelChunk extends ChunkAccess {
+ if (this.blockEntity.getType().isValid(iblockdata)) {
+ this.ticker.tick(LevelChunk.this.level, this.blockEntity.getBlockPos(), iblockdata, this.blockEntity);
+ this.loggedInvalidBlockState = false;
+- } else if (!this.loggedInvalidBlockState) {
+- this.loggedInvalidBlockState = true;
+- LevelChunk.LOGGER.warn("Block entity {} @ {} state {} invalid for ticking:", new Object[]{LogUtils.defer(this::getType), LogUtils.defer(this::getPos), iblockdata});
++ // Paper start - Remove the Block Entity if it's invalid
++ } else {
++ LevelChunk.this.removeBlockEntity(this.getPos());
++ if (!this.loggedInvalidBlockState) {
++ this.loggedInvalidBlockState = true;
++ LevelChunk.LOGGER.warn("Block entity {} @ {} state {} invalid for ticking:", new Object[]{LogUtils.defer(this::getType), LogUtils.defer(this::getPos), iblockdata});
++ }
++ // Paper end - Remove the Block Entity if it's invalid
+ }
+
+ gameprofilerfiller.pop();