From 8a19c55d2daaa9d0c877a458a74e0ad9f4592569 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Thu, 11 Nov 2021 01:26:03 -0500 Subject: [PATCH] Revert "Fix FAWE //regen" This reverts commit 943ee01126b308efb530c3efb8ecb96fa0840317. This is actually an issue within FAWE's codebase. Negative numbers *can* exist --- patches/server/0217-Structure-seed-options.patch | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/patches/server/0217-Structure-seed-options.patch b/patches/server/0217-Structure-seed-options.patch index 5d4190e0b..0128c7a69 100644 --- a/patches/server/0217-Structure-seed-options.patch +++ b/patches/server/0217-Structure-seed-options.patch @@ -5,28 +5,22 @@ Subject: [PATCH] Structure seed options 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 6a1cb38de5733e384546984a0eadd4bab53c0122..710ee90d1dae5bdf330249fc1c3faf60fe4db303 100644 +index 6a1cb38de5733e384546984a0eadd4bab53c0122..3db79ce2ee0e72fe521beaaf6373a5ff0820be69 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -424,6 +424,23 @@ public abstract class ChunkGenerator { +@@ -424,6 +424,17 @@ public abstract class ChunkGenerator { case "village": seed = conf.villageSeed; break; + // Purpur start + case "stronghold": -+ if (net.pl3x.purpur.PurpurConfig.seedStructureStronghold > -1) { -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold; -+ } ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold; + break; + case "mineshaft": -+ if (net.pl3x.purpur.PurpurConfig.seedStructureMineshaft > -1) { -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft; -+ } ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft; + break; + case "buried_treasure": -+ if (net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure > -1) { -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure; -+ } ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure; + break; + // Purpur end }