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-04-12 21:14:06 +02:00
|
|
|
index f39a35f7c6ee61d5d7375e9792957f27e507cf0c..447b0359922011fe12b1bb9628d23a47c9d7dc89 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-04-12 21:14:06 +02:00
|
|
|
@@ -136,7 +136,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());
|
2022-12-07 23:05:32 +01:00
|
|
|
Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registries.TEMPLATE_POOL);
|
2022-10-01 10:08:07 +02:00
|
|
|
- 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;
|
|
|
|
+ }
|
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);
|
|
|
|
}
|
|
|
|
|
2022-09-29 13:37:56 +02:00
|
|
|
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
|
2024-04-12 21:14:06 +02:00
|
|
|
index c8e41cd51bddfafb3675352ea9ec39188ee91a80..488ddcc22dfb08baedc080326b1531151826a702 100644
|
2022-09-29 13:37:56 +02:00
|
|
|
--- 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
|
2024-04-12 21:14:06 +02:00
|
|
|
@@ -98,7 +98,13 @@ public class StructureTemplatePool {
|
2022-09-29 13:37:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public StructurePoolElement getRandomTemplate(RandomSource random) {
|
|
|
|
+ //Paper start - Prevent random.nextInt throwing an IllegalArgumentException
|
|
|
|
+ if (this.templates.size() == 0) {
|
|
|
|
+ return EmptyPoolElement.INSTANCE;
|
|
|
|
+ } else {
|
|
|
|
return this.templates.get(random.nextInt(this.templates.size()));
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
public List<StructurePoolElement> getShuffledTemplates(RandomSource random) {
|