Fix deprecation code for setting world settings

This commit is contained in:
tastybento 2023-07-04 17:05:44 -07:00
parent 98d3a55c50
commit 7a67d2b7f6
1 changed files with 9 additions and 7 deletions

View File

@ -2,6 +2,7 @@ package world.bentobox.bskyblock;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.entity.SpawnCategory;
import org.bukkit.WorldCreator; import org.bukkit.WorldCreator;
import org.bukkit.WorldType; import org.bukkit.WorldType;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -129,24 +130,25 @@ public class BSkyBlock extends GameModeAddon implements Listener {
WorldCreator wc = WorldCreator.name(worldName2).type(WorldType.FLAT).environment(env); WorldCreator wc = WorldCreator.name(worldName2).type(WorldType.FLAT).environment(env);
World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld(); World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
// Set spawn rates // Set spawn rates
if (w != null) { // Set spawn rates
if (w != null && getSettings() != null) {
if (getSettings().getSpawnLimitMonsters() > 0) { if (getSettings().getSpawnLimitMonsters() > 0) {
w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters()); w.setSpawnLimit(SpawnCategory.MONSTER, getSettings().getSpawnLimitMonsters());
} }
if (getSettings().getSpawnLimitAmbient() > 0) { if (getSettings().getSpawnLimitAmbient() > 0) {
w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient()); w.setSpawnLimit(SpawnCategory.AMBIENT, getSettings().getSpawnLimitAmbient());
} }
if (getSettings().getSpawnLimitAnimals() > 0) { if (getSettings().getSpawnLimitAnimals() > 0) {
w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals()); w.setSpawnLimit(SpawnCategory.ANIMAL, getSettings().getSpawnLimitAnimals());
} }
if (getSettings().getSpawnLimitWaterAnimals() > 0) { if (getSettings().getSpawnLimitWaterAnimals() > 0) {
w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals()); w.setSpawnLimit(SpawnCategory.WATER_ANIMAL, getSettings().getSpawnLimitWaterAnimals());
} }
if (getSettings().getTicksPerAnimalSpawns() > 0) { if (getSettings().getTicksPerAnimalSpawns() > 0) {
w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns()); w.setTicksPerSpawns(SpawnCategory.ANIMAL, getSettings().getTicksPerAnimalSpawns());
} }
if (getSettings().getTicksPerMonsterSpawns() > 0) { if (getSettings().getTicksPerMonsterSpawns() > 0) {
w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns()); w.setTicksPerSpawns(SpawnCategory.MONSTER, getSettings().getTicksPerMonsterSpawns());
} }
} }
return w; return w;