Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't print error message if we're expecting it on biome loading

Browse Source
This commit is contained in:
dordsor21 2021-09-22 15:58:11 +01:00
parent 3376baa3c5
commit a3d50585c2
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -235,7 +235,7 @@ public class WorldEditPlugin extends JavaPlugin {
// datapacks aren't loaded until just before the world is, and bukkit has no event for this // datapacks aren't loaded until just before the world is, and bukkit has no event for this
// so the earliest we can do this is in WorldInit // so the earliest we can do this is in WorldInit
setupTags(); setupTags();
setupBiomes(); // FAWE - load biomes later. Initialize biomes twice to allow for the registry to be present for setupBiomes(true); // FAWE - load biomes later. Initialize biomes twice to allow for the registry to be present for
// plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE. // plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE.
WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform)); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform));
} }
@ -244,7 +244,7 @@ public class WorldEditPlugin extends JavaPlugin {
private void initializeRegistries() { private void initializeRegistries() {
// FAWE start - move Biomes to their own method. Initialize biomes twice to allow for the registry to be present for // FAWE start - move Biomes to their own method. Initialize biomes twice to allow for the registry to be present for
// plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE. // plugins requiring WE biomes during startup, as well as allowing custom biomes loaded later on to be present in WE.
setupBiomes(); setupBiomes(false);
// FAWE end // FAWE end
/* /*
@ -308,7 +308,7 @@ public class WorldEditPlugin extends JavaPlugin {
} }
// FAWE start // FAWE start
private void setupBiomes() { private void setupBiomes(boolean expectFail) {
if (this.adapter.value().isPresent()) { if (this.adapter.value().isPresent()) {
// Biomes are stored globally in the server. Registries are not kept per-world in Minecraft. // Biomes are stored globally in the server. Registries are not kept per-world in Minecraft.
// The WorldServer get-registries method simply delegates to the MinecraftServer method. // The WorldServer get-registries method simply delegates to the MinecraftServer method.
@ -318,7 +318,9 @@ public class WorldEditPlugin extends JavaPlugin {
} }
} }
} else { } else {
LOGGER.warn("Failed to load biomes via adapter (not present). Will load via bukkit"); if (!expectFail) {
LOGGER.warn("Failed to load biomes via adapter (not present). Will load via bukkit");
}
for (Biome biome : Biome.values()) { for (Biome biome : Biome.values()) {
// Custom is bad // Custom is bad
if (biome.name().equals("CUSTOM")) { if (biome.name().equals("CUSTOM")) {