mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
654b792caf
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
45 lines
3.1 KiB
Diff
45 lines
3.1 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/server/WorldGenSurfaceNether.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNether.java
|
|
index 6677740edb41901d6f8f92b6339e04b4e22cb6b6..dd3511d520cc385e4e89773e12d0e35aae8ecf3d 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenSurfaceNether.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNether.java
|
|
@@ -29,7 +29,7 @@ public class WorldGenSurfaceNether extends WorldGenSurface<WorldGenSurfaceConfig
|
|
IBlockData iblockdata2 = worldgensurfaceconfigurationbase.a();
|
|
IBlockData iblockdata3 = worldgensurfaceconfigurationbase.b();
|
|
|
|
- for (int k2 = 127; k2 >= 0; --k2) {
|
|
+ for (int k2 = k; k2 >= 0; --k2) { // Paper - fix MC-187716 - use configured height
|
|
blockposition_mutableblockposition.d(k1, k2, l1);
|
|
IBlockData iblockdata4 = ichunkaccess.getType(blockposition_mutableblockposition);
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
|
|
index 1ff8b4eb10bffb0c33c2ad8d1d490d3da99e72f2..462f0b2baea4207d7d82f2d4e043a5a7999a1f42 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java
|
|
@@ -37,7 +37,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface<Worl
|
|
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
|
IBlockData iblockdata4 = ichunkaccess.getType(blockposition_mutableblockposition.d(k1, 128, l1));
|
|
|
|
- for (int k2 = 127; k2 >= 0; --k2) {
|
|
+ for (int k2 = k; k2 >= 0; --k2) { // Paper - fix MC-187716 - use configured height
|
|
blockposition_mutableblockposition.d(k1, k2, l1);
|
|
IBlockData iblockdata5 = ichunkaccess.getType(blockposition_mutableblockposition);
|
|
int l2;
|
|
diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherForest.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherForest.java
|
|
index c3c31fa356b2cd63db312ec15c5e45320cf6cfbb..4618425bf8c0d90a5399986691b451d2a9311d5a 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherForest.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherForest.java
|
|
@@ -27,7 +27,7 @@ public class WorldGenSurfaceNetherForest extends WorldGenSurface<WorldGenSurface
|
|
int j2 = -1;
|
|
IBlockData iblockdata2 = worldgensurfaceconfigurationbase.b();
|
|
|
|
- for (int k2 = 127; k2 >= 0; --k2) {
|
|
+ for (int k2 = k; k2 >= 0; --k2) { // Paper - fix MC-187716 - use configured height
|
|
blockposition_mutableblockposition.d(k1, k2, l1);
|
|
IBlockData iblockdata3 = worldgensurfaceconfigurationbase.a();
|
|
IBlockData iblockdata4 = ichunkaccess.getType(blockposition_mutableblockposition);
|