From 798b98b3cfd54cefd58322252dc5da4f5819837d Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Tue, 10 May 2022 01:49:33 +0100 Subject: [PATCH] Fix generation of augmented/partial worlds when single worlds are enabled - Enabling single worlds adds "PlotSquared:single" to the generators map in SetupUtils - Adding a switch for if the map has ever been loaded into means that the first time updateGenerators is called, they will always be updated - This means that ultimately PlotSquared is not added as a generator for augmented/partial worlds in bukkit/yml (as it is not, it is a populator) --- .../java/com/plotsquared/bukkit/util/BukkitSetupUtils.java | 3 ++- Core/src/main/java/com/plotsquared/core/util/SetupUtils.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java index 1efd58a5c..e74553201 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -76,7 +76,7 @@ public class BukkitSetupUtils extends SetupUtils { @Override public void updateGenerators(final boolean force) { - if (!SetupUtils.generators.isEmpty() && !force) { + if (loaded && !SetupUtils.generators.isEmpty() && !force) { return; } String testWorld = "CheckingPlotSquaredGenerator"; @@ -100,6 +100,7 @@ public class BukkitSetupUtils extends SetupUtils { e.printStackTrace(); } } + loaded = true; } @Override diff --git a/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java b/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java index 7ac32e333..edb46f3d0 100644 --- a/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java +++ b/Core/src/main/java/com/plotsquared/core/util/SetupUtils.java @@ -34,6 +34,7 @@ import java.util.HashMap; public abstract class SetupUtils { public static HashMap> generators = new HashMap<>(); + protected boolean loaded = false; /** * @since 6.1.0