Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 1.18 datapack generation with caves (#521)

Browse Source
This commit is contained in:
Bierque Jason
2021-07-29 23:47:34 +02:00
committed by GitHub
parent cdc0e32ca8
commit 9d5022e55e
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
View File

@@ -4,6 +4,33 @@ Date: Tue, 20 Jul 2021 02:18:23 +0200
Subject: [PATCH] Fix Important Issue Crash with Plugin or Datapack Generation
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
index 2d102ea80d3f8e8aad0d57626450a7f30bb6c346..6b99c901d30d4334b1651a1853a79603d74e64bf 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/DecoratedFeature.java
@@ -24,12 +24,16 @@ public class DecoratedFeature extends Feature<DecoratedFeatureConfiguration> {
Random random = getRnd(context.random(), net.pl3x.purpur.PurpurConfig.seedFeatureDecorated); // Purpur
BlockPos blockPos = context.origin();
ConfiguredFeature<?, ?> configuredFeature = decoratedFeatureConfiguration.feature.get();
- decoratedFeatureConfiguration.decorator.getPositions(new DecorationContext(worldGenLevel, chunkGenerator), random, blockPos).forEach((blockPosx) -> {
- if (configuredFeature.place(worldGenLevel, chunkGenerator, random, blockPosx)) {
- mutableBoolean.setTrue();
- }
-
- });
+ // Purpur Start - Change forEach to Iterator for check with try catch error with caves 1.18
+ java.util.Iterator<BlockPos> blockPosIterator = decoratedFeatureConfiguration.decorator.getPositions(new DecorationContext(worldGenLevel, chunkGenerator), random, blockPos).iterator();
+ while (blockPosIterator.hasNext()) {
+ try {
+ if (configuredFeature.place(worldGenLevel, chunkGenerator, random, blockPosIterator.next())) {
+ mutableBoolean.setTrue();
+ }
+ } catch (Exception ignored) {} // No need set false (Exception Possible : NullPointerException and RuntimeException
+ }
+ // Purpur End
return mutableBoolean.isTrue();
}
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/TreeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/TreeFeature.java
index 2f71e80f6c9d37a97d1d03b7a1d893c825b315fa..ba36676977cc3665a4ea20c556133d4faf06af3e 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/TreeFeature.java