2022-09-29 13:37:56 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Legitimoose <legitimoose@gmail.com>
|
|
|
|
Date: Wed, 28 Sep 2022 22:45:49 -0700
|
|
|
|
Subject: [PATCH] fix Jigsaw block kicking user
|
|
|
|
|
|
|
|
|
2022-10-01 10:08:07 +02:00
|
|
|
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
|
2024-10-25 14:55:49 +02:00
|
|
|
index 42300114e3baf31fd26090fca3b497c8157d4bb9..6410cd7a7324bb04e9285a5b090b1675a5ffa16f 100644
|
2022-10-01 10:08:07 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
|
2024-10-23 23:35:21 +02:00
|
|
|
@@ -131,7 +131,12 @@ public class JigsawBlockEntity extends BlockEntity {
|
2022-10-01 10:08:07 +02:00
|
|
|
public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
|
|
|
|
BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front());
|
2024-10-23 23:35:21 +02:00
|
|
|
Registry<StructureTemplatePool> registry = world.registryAccess().lookupOrThrow(Registries.TEMPLATE_POOL);
|
|
|
|
- Holder<StructureTemplatePool> holder = registry.getOrThrow(this.pool);
|
2022-10-01 10:08:07 +02:00
|
|
|
+ // Paper start - Replace getHolderOrThrow with a null check
|
2024-10-25 14:55:49 +02:00
|
|
|
+ Holder<StructureTemplatePool> holder = registry.get(this.pool).orElse(null);
|
2022-10-01 10:08:07 +02:00
|
|
|
+ if (holder == null) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
2024-01-18 15:56:25 +01:00
|
|
|
+ // Paper end - Replace getHolderOrThrow with a null check
|
2022-10-01 10:08:07 +02:00
|
|
|
JigsawPlacement.generateJigsaw(world, holder, this.target, maxDepth, blockPos, keepJigsaws);
|
|
|
|
}
|
|
|
|
|