Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2024-11-26 04:36:00 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
tastybento 2020-11-27 08:03:06 -08:00
commit 0fa81685c6
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -65,7 +65,7 @@
<!-- Do not change unless you want different name for local builds. --> <!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number> <build.number>-LOCAL</build.number>
<!-- This allows to change between versions. --> <!-- This allows to change between versions. -->
<build.version>1.14.4</build.version> <build.version>1.14.5</build.version>
</properties> </properties>
<!-- Profiles will allow to automatically change build version. --> <!-- Profiles will allow to automatically change build version. -->

24
src/main/java/world/bentobox/acidisland/AcidIsland.java
View File

@ -144,12 +144,24 @@ public class AcidIsland extends GameModeAddon {
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) { if (w != null) {
w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters()); if (getSettings().getSpawnLimitMonsters() > 0) {
w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient()); w.setMonsterSpawnLimit(getSettings().getSpawnLimitMonsters());
w.setAnimalSpawnLimit(getSettings().getSpawnLimitAnimals()); }
w.setWaterAnimalSpawnLimit(getSettings().getSpawnLimitWaterAnimals()); if (getSettings().getSpawnLimitAmbient() > 0) {
w.setTicksPerAnimalSpawns(getSettings().getTicksPerAnimalSpawns()); w.setAmbientSpawnLimit(getSettings().getSpawnLimitAmbient());
w.setTicksPerMonsterSpawns(getSettings().getTicksPerMonsterSpawns()); }
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; return w;