core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing null check in ChunkGenerator#findNearestMapStructure

This commit is contained in:
Shane Freeder 2022-06-20 15:01:29 +01:00
parent 9797f081c2
commit ed9cf5ca08
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/server/0917-Fix-missing-null-check-in-ChunkGenerator-findNearest.patch Normal file
View File

@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 20 Jun 2022 14:59:38 +0100
Subject: [PATCH] Fix missing null check in
ChunkGenerator#findNearestMapStructure
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index cdfe2589ca598263d58a11a978e176ab3ecb87e6..264ca51c2f2a5ff69688372b71ad7355366bac1a 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -353,6 +353,7 @@ public abstract class ChunkGenerator {
if (structureplacement1 instanceof ConcentricRingsStructurePlacement) {
ConcentricRingsStructurePlacement concentricringsstructureplacement = (ConcentricRingsStructurePlacement) structureplacement1;
Pair<BlockPos, Holder<Structure>> pair1 = this.getNearestGeneratedStructure((Set) entry.getValue(), world, structuremanager, center, skipReferencedStructures, concentricringsstructureplacement);
+ if (pair1 == null) continue; // Paper
BlockPos blockposition1 = (BlockPos) pair1.getFirst();
double d1 = center.distSqr(blockposition1);