geforkt von Mirrors/Paper
Fix other jigsaw related disconnect bug (#8414)
Dieser Commit ist enthalten in:
Ursprung
bcbb7dae76
Commit
f064550583
@ -4,6 +4,24 @@ Date: Wed, 28 Sep 2022 22:45:49 -0700
|
|||||||
Subject: [PATCH] fix Jigsaw block kicking user
|
Subject: [PATCH] fix Jigsaw block kicking user
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
|
||||||
|
@@ -0,0 +0,0 @@ public class JigsawBlockEntity extends BlockEntity {
|
||||||
|
public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
|
||||||
|
BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front());
|
||||||
|
Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registry.TEMPLATE_POOL_REGISTRY);
|
||||||
|
- Holder<StructureTemplatePool> holder = registry.getHolderOrThrow(this.pool);
|
||||||
|
+ // Paper start - Replace getHolderOrThrow with a null check
|
||||||
|
+ Holder<StructureTemplatePool> holder = registry.getHolder(this.pool).orElse(null);
|
||||||
|
+ if (holder == null) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
JigsawPlacement.generateJigsaw(world, holder, this.target, maxDepth, blockPos, keepJigsaws);
|
||||||
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java
|
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren