geforkt von Mirrors/Paper
4d40e87b33
Had to drop some hunks modifying getEntities, as those methods were rewritten by Mojang in 1.17
51 Zeilen
3.6 KiB
Diff
51 Zeilen
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 15 Aug 2020 08:04:49 -0500
|
|
Subject: [PATCH] Fix MC-187716 Use configured height
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
|
|
index 5ad6e0ef718a1775a2310925b8273120687230b1..7c3386b37aae7d10629e0a256102967f69b68a7e 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
|
|
@@ -42,7 +42,7 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder<SurfaceB
|
|
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
|
|
BlockState blockState3 = chunk.getBlockState(mutableBlockPos.set(k, 128, m));
|
|
|
|
- for(int p = 127; p >= i; --p) {
|
|
+ for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
|
|
mutableBlockPos.set(k, p, m);
|
|
BlockState blockState4 = chunk.getBlockState(mutableBlockPos);
|
|
if (blockState3.is(defaultBlock.getBlock()) && (blockState4.isAir() || blockState4 == defaultFluid)) {
|
|
@@ -103,3 +103,4 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder<SurfaceB
|
|
|
|
protected abstract BlockState getPatchBlockState();
|
|
}
|
|
+
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
|
|
index fbb756504609285d96e01c4079be06561f75331e..aa6be90ac272c7e1186d177768230b7f52371e68 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
|
|
@@ -34,7 +34,7 @@ public class NetherForestSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBas
|
|
int o = -1;
|
|
BlockState blockState = surfaceBuilderBaseConfiguration.getUnderMaterial();
|
|
|
|
- for(int p = 127; p >= i; --p) {
|
|
+ for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
|
|
mutableBlockPos.set(k, p, m);
|
|
BlockState blockState2 = surfaceBuilderBaseConfiguration.getTopMaterial();
|
|
BlockState blockState3 = chunk.getBlockState(mutableBlockPos);
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
|
|
index 0cdb3a1ca76375fc69d1709cdd34d4176a99a617..206f74305a01604892ff98ece0c8344cc5582d14 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
|
|
@@ -36,7 +36,7 @@ public class NetherSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfi
|
|
BlockState blockState = surfaceBuilderBaseConfiguration.getTopMaterial();
|
|
BlockState blockState2 = surfaceBuilderBaseConfiguration.getUnderMaterial();
|
|
|
|
- for(int p = 127; p >= i; --p) {
|
|
+ for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
|
|
mutableBlockPos.set(k, p, m);
|
|
BlockState blockState3 = chunk.getBlockState(mutableBlockPos);
|
|
if (blockState3.isAir()) {
|