From 8bb5a93918fd4de33f0a1c9ad93a0c48a59a8ecb Mon Sep 17 00:00:00 2001 From: Encode42 Date: Thu, 11 Nov 2021 20:26:01 -0500 Subject: [PATCH] Ignore structure e seeds if set to -1 This is a temporary fix for FAWE. It does not fix the root cause, and should not be permanent. --- patches/server/0216-Structure-seed-options.patch | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/patches/server/0216-Structure-seed-options.patch b/patches/server/0216-Structure-seed-options.patch index 0128c7a69..1850f2377 100644 --- a/patches/server/0216-Structure-seed-options.patch +++ b/patches/server/0216-Structure-seed-options.patch @@ -5,22 +5,28 @@ 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..3db79ce2ee0e72fe521beaaf6373a5ff0820be69 100644 +index 6a1cb38de5733e384546984a0eadd4bab53c0122..42cc3ef9bd70b96f2c2f166590792650ffbd1507 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,17 @@ public abstract class ChunkGenerator { +@@ -424,6 +424,23 @@ public abstract class ChunkGenerator { case "village": seed = conf.villageSeed; break; + // Purpur start + case "stronghold": -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold; ++ if (net.pl3x.purpur.PurpurConfig.seedStructureStronghold != -1) { ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold; ++ } + break; + case "mineshaft": -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft; ++ if (net.pl3x.purpur.PurpurConfig.seedStructureMineshaft != -1) { ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft; ++ } + break; + case "buried_treasure": -+ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure; ++ if (net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure != -1) { ++ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure; ++ } + break; + // Purpur end }