Merge branch 'develop'

BentoBoxWorld · Nov 27, 2020 · 0fa8168 · 0fa8168
2 parents 8f427e0 + 6907edd
commit 0fa8168
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.14.4</build.version>
+        <build.version>1.14.5</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->

diff --git a/src/main/java/world/bentobox/acidisland/AcidIsland.java b/src/main/java/world/bentobox/acidisland/AcidIsland.java
@@ -144,12 +144,24 @@ private World getWorld(String worldName2, Environment env, @Nullable ChunkGenera
         World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
         // Set spawn rates
         if (w != null) {
-            w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters());
-            w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient());
-            w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals());
-            w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals());
-            w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns());
-            w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns());
+            if (getSettings().getSpawnLimitMonsters() > 0) {
+                w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters());
+            }
+            if (getSettings().getSpawnLimitAmbient() > 0) {
+                w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient());
+            }
+            if (getSettings().getSpawnLimitAnimals() > 0) {
+                w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals());
+            }
+            if (getSettings().getSpawnLimitWaterAnimals() > 0) {
+                w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals());
+            }
+            if (getSettings().getTicksPerAnimalSpawns() > 0) {
+                w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns());
+            }
+            if (getSettings().getTicksPerMonsterSpawns() > 0) {
+                w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns());
+            }
         }
         return w;