Merge branch 'develop' of https://github.com/BentoBoxWorld/CaveBlock.git
into develop Conflicts: pom.xml
This commit is contained in:
commit
d9ca6689e1
2
pom.xml
2
pom.xml
|
@ -50,7 +50,7 @@
|
|||
<!-- Revision variable removes warning about dynamic version -->
|
||||
<revision>${build.version}-SNAPSHOT</revision>
|
||||
<!-- This allows to change between versions and snapshots. -->
|
||||
<build.version>1.14.2</build.version>
|
||||
<build.version>1.14.3</build.version>
|
||||
<build.number>-LOCAL</build.number>
|
||||
</properties>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package world.bentobox.caveblock;
|
||||
|
||||
|
||||
import com.google.common.base.Enums;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
@ -15,6 +14,8 @@ import org.bukkit.Material;
|
|||
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;
|
||||
|
@ -1990,6 +1991,14 @@ public class Settings implements WorldSettings
|
|||
this.ticksPerMonsterSpawns = ticksPerMonsterSpawns;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see world.bentobox.bentobox.api.configuration.WorldSettings#isCheckForBlocks()
|
||||
*/
|
||||
@Override
|
||||
public boolean isCheckForBlocks() {
|
||||
// Do not check for blocks when looking for new island spots
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue