diff options
| author | Zach Brown <[email protected]> | 2019-09-27 20:53:20 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2019-09-27 20:53:20 -0500 |
| commit | 936d57ba93d1446fc147729e6ee2071ec32d5761 (patch) | |
| tree | cf042f16062d77b2936db199f5c7e7e2bb07e209 | |
| parent | 767b93555228936862577978440a31c5160ed284 (diff) | |
| download | Paper-936d57ba93d1446fc147729e6ee2071ec32d5761.tar.gz Paper-936d57ba93d1446fc147729e6ee2071ec32d5761.zip | |
Use local variable for bedrock generation
Fixes GH-2596.
| -rw-r--r-- | Spigot-Server-Patches/0417-Generator-Settings.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Spigot-Server-Patches/0417-Generator-Settings.patch b/Spigot-Server-Patches/0417-Generator-Settings.patch index 5882f205d8..f0d9fcbf01 100644 --- a/Spigot-Server-Patches/0417-Generator-Settings.patch +++ b/Spigot-Server-Patches/0417-Generator-Settings.patch @@ -1,4 +1,4 @@ -From c7b21a27f6c0f9d3fa2dfbd8ad2aa9a42a0363bc Mon Sep 17 00:00:00 2001 +From e57e2a690085cbbb4425fe60ebe69071bea3e195 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings @@ -19,7 +19,7 @@ index 246bb4b01..29fd49968 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index 096866b2b..0e104c8c1 100644 +index 096866b2b..338b67c3c 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -198,8 +198,8 @@ public abstract class ChunkGeneratorAbstract<T extends GeneratorSettingsDefault> @@ -47,7 +47,7 @@ index 096866b2b..0e104c8c1 100644 if (k < 256) { for (i1 = k + 4; i1 >= k; --i1) { - if (i1 <= k + random.nextInt(5)) { -+ if (i1 <= (getWorld().paperConfig.generateFlatBedrock ? floorHeight : this.k + random.nextInt(5))) { // Paper - Configurable flat bedrock floor ++ if (i1 <= (getWorld().paperConfig.generateFlatBedrock ? floorHeight : k + random.nextInt(5))) { // Paper - Configurable flat bedrock floor ichunkaccess.setType(blockposition_mutableblockposition.d(blockposition.getX(), i1, blockposition.getZ()), Blocks.BEDROCK.getBlockData(), false); } } |