EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 10:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix #3231

Browse Source
This commit is contained in:
dordsor21
2021-09-07 14:47:37 +01:00
parent 8e5e33eec2
commit 732f79bbfc
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
View File

@ -419,6 +419,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
}, TaskTime.ticks(1L));
}
// Once the server has loaded force updating all generators known to P2
TaskManager.runTaskLater(() -> PlotSquared.platform().setupUtils().updateGenerators(true), TaskTime.ticks(1L));
// Services are accessed in order
final CacheUUIDService cacheUUIDService = new CacheUUIDService(Settings.UUID.UUID_CACHE_SIZE);
this.impromptuPipeline.registerService(cacheUUIDService);

8
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
View File

@ -75,8 +75,8 @@ public class BukkitSetupUtils extends SetupUtils {
}
@Override
public void updateGenerators() {
if (!SetupUtils.generators.isEmpty()) {
public void updateGenerators(final boolean force) {
if (!SetupUtils.generators.isEmpty() && !force) {
return;
}
String testWorld = "CheckingPlotSquaredGenerator";
@ -128,7 +128,7 @@ public class BukkitSetupUtils extends SetupUtils {
@Override
public String setupWorld(PlotAreaBuilder builder) {
this.updateGenerators();
this.updateGenerators(false);
ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
String world = builder.worldName();
@ -240,7 +240,7 @@ public class BukkitSetupUtils extends SetupUtils {
@Override
public String getGenerator(PlotArea plotArea) {
if (SetupUtils.generators.isEmpty()) {
updateGenerators();
updateGenerators(false);
}
World world = Bukkit.getWorld(plotArea.getWorldName());
if (world == null) {

2
Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
View File

@ -38,7 +38,7 @@ import java.util.ArrayList;
public class SetGenCB {
public static void setGenerator(World world) throws Exception {
PlotSquared.platform().setupUtils().updateGenerators();
PlotSquared.platform().setupUtils().updateGenerators(false);
PlotSquared.get().removePlotAreas(world.getName());
ChunkGenerator gen = world.getGenerator();
if (gen == null) {