Skip to content

Fix Crash Issue With Custom Structure DataPack #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Euphillya wants to merge 2 commits into from
Closed

Fix Crash Issue With Custom Structure DataPack #535

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
096a80b
Fix Crash Issue With Custom Feature DataPack
Euphillya Aug 1, 2021
e0180ff
change , to -
Euphillya Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix Crash Issue With Custom Feature DataPack
  • Loading branch information
@Euphillya
Euphillya committed Aug 1, 2021
commit 096a80b4664ed1d7d88d7d8ca36acd7636a6fbad
12 changes: 12 additions & 0 deletions patches/server/0236-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ 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/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
index 9fb19162c0e436122087d03d37b502a19b31cb9e..fff8bf8b24a4042c068f71878f097d6f9e5178c4 100644
--- a/src/main/java/net/minecraft/world/level/biome/Biome.java
+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
@@ -245,6 +245,7 @@ public final class Biome {
region.setCurrentlyGenerating(supplier);
// Paper start - remove structure streams
for (StructureStart<?> structureStart : structureAccessor.streamlessStartsForFeature(SectionPos.of(origin), structureFeature)) {
+ if (structureStart == null) continue; // Purpur Fix, structure can be null
structureStart.placeInChunk(region, structureAccessor, chunkGenerator, random, new BoundingBox(n, p, o, n + 15, q, o + 15), new ChunkPos(l, m));
}
// Paper end
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
Expand Down