Enable backwards compatibility with 1.15.2

BentoBoxWorld · Jun 30, 2020 · 6833fb0 · 6833fb0
1 parent 27edda5
commit 6833fb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java
@@ -12,6 +12,8 @@
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
 
+import com.google.common.base.Enums;
+
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.StoreAt;
@@ -148,7 +150,7 @@ public class Settings implements WorldSettings {
     private Biome defaultBiome = Biome.PLAINS;
     @ConfigComment("The default biome for the nether world (this may affect what mobs can spawn)")
     @ConfigEntry(path = "world.default-nether-biome")
-    private Biome defaultNetherBiome = Biome.NETHER_WASTES;
+    private Biome defaultNetherBiome = Enums.getIfPresent(Biome.class, "NETHER").or(Enums.getIfPresent(Biome.class, "NETHER_WASTES").or(Biome.BADLANDS));
     @ConfigComment("The default biome for the end world (this may affect what mobs can spawn)")
     @ConfigEntry(path = "world.default-end-biome")
     private Biome defaultEndBiome = Biome.THE_END;

diff --git a/src/main/resources/blueprints/nether-island.blu b/src/main/resources/blueprints/nether-island.blu
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -90,8 +90,6 @@ world:
   default-game-mode: SURVIVAL
   # The default biome for the overworld
   default-biome: PLAINS
-  # The default biome for the nether world (this may affect what mobs can spawn)
-  default-nether-biome: NETHER_WASTES
   # The default biome for the end world (this may affect what mobs can spawn)
   default-end-biome: THE_END
   # The maximum number of players a player can ban at any one time in this game mode.
@@ -127,7 +125,6 @@ world:
   remove-mobs-whitelist:
   - ZOMBIE_VILLAGER
   - ENDERMAN
-  - ZOMBIFIED_PIGLIN
   - WITHER
   # World flags. These are boolean settings for various flags for this world
   flags: