Enabled option to include nether and end islands in level calc

https://github.com/BentoBoxWorld/Level/issues/40

src/main/java/world/bentobox/level/calculators/CalcIslandLevel.java

@@ -41,12 +41,13 @@ public class CalcIslandLevel {
 
     private final Set<Pair<Integer, Integer>> chunksToScan;
     private final Island island;
-    private final World world;
     private final Results result;
     private final Runnable onExit;
 
     // Copy the limits hash map
     private final HashMap<Material, Integer> limitCount;
+    private final World world;
+    private final List<World> worlds;
 
 
     /**
@@ -59,7 +60,17 @@ public class CalcIslandLevel {
     public CalcIslandLevel(final Level addon, final Island island, final Runnable onExit) {
         this.addon = addon;
         this.island = island;
-        this.world = island.getCenter().getWorld();
+        this.world = island.getWorld();
+        this.worlds = new ArrayList<>();
+        this.worlds.add(world);
+        if (addon.getSettings().isNether()) {
+            World netherWorld = addon.getPlugin().getIWM().getNetherWorld(world);
+            if (netherWorld != null) this.worlds.add(netherWorld);
+        }
+        if (addon.getSettings().isEnd()) {
+            World endWorld = addon.getPlugin().getIWM().getEndWorld(world);
+            if (endWorld != null) this.worlds.add(endWorld);
+        }
         this.limitCount = new HashMap<>(addon.getSettings().getBlockLimits());
         this.onExit = onExit;
 
@@ -88,6 +99,7 @@ public class CalcIslandLevel {
                 // Add chunk snapshots to the list
                 while (it.hasNext() && chunkSnapshot.size() < MAX_CHUNKS) {
                     Pair<Integer, Integer> pair = it.next();
+                    for (World world : worlds) {
                         if (!world.isChunkLoaded(pair.x, pair.z)) {
                             world.loadChunk(pair.x, pair.z);
                             chunkSnapshot.add(world.getChunkAt(pair.x, pair.z).getChunkSnapshot());
@@ -95,6 +107,7 @@ public class CalcIslandLevel {
                         } else {
                             chunkSnapshot.add(world.getChunkAt(pair.x, pair.z).getChunkSnapshot());
                         }
+                    }
                     it.remove();
                 }
                 // Move to next step
@@ -117,6 +130,10 @@ public class CalcIslandLevel {
     }
 
     private void scanChunk(ChunkSnapshot chunk) {
+        World chunkWorld = Bukkit.getWorld(chunk.getWorldName());
+        if (chunkWorld == null) return;
+        int maxHeight = chunkWorld.getMaxHeight();
+
         for (int x = 0; x< 16; x++) {
             // Check if the block coordinate is inside the protection zone and if not, don't count it
             if (chunk.getX() * 16 + x < island.getMinProtectedX() || chunk.getX() * 16 + x >= island.getMinProtectedX() + island.getProtectionRange() * 2) {
@@ -128,9 +145,9 @@ public class CalcIslandLevel {
                     continue;
                 }
 
-                for (int y = 0; y < island.getCenter().getWorld().getMaxHeight(); y++) {
+                for (int y = 0; y < maxHeight; y++) {
                     BlockData blockData = chunk.getBlockData(x, y, z);
-                    int seaHeight = addon.getPlugin().getIWM().getSeaHeight(world);
+                    int seaHeight = addon.getPlugin().getIWM().getSeaHeight(chunkWorld);
                     boolean belowSeaLevel = seaHeight > 0 && y <= seaHeight;
                     // Slabs can be doubled, so check them twice
                     if (Tag.SLABS.isTagged(blockData.getMaterial())) {

src/main/java/world/bentobox/level/config/Settings.java

@@ -14,6 +14,7 @@ import world.bentobox.level.Level;
 
 public class Settings {
 
+    private Level level;
     private boolean sumTeamDeaths;
     private Map<Material, Integer> blockLimits = new HashMap<>();
     private Map<Material, Integer> blockValues = new HashMap<>();
@@ -25,7 +26,7 @@ public class Settings {
     private List<String> gameModes = new ArrayList<>();
 
     public Settings(Level level) {
-
+        this.level = level;
         level.saveDefaultConfig();
 
         // GameModes
@@ -190,4 +191,18 @@ public class Settings {
         return gameModes;
     }
 
+    /**
+     * @return if the nether island should be included in the level calc or not
+     */
+    public boolean isNether() {
+        return level.getConfig().getBoolean("nether");
+    }
+
+    /**
+     * @return if the end island should be included in the level calc or not
+     */
+    public boolean isEnd() {
+        return level.getConfig().getBoolean("end");
+    }
+
 }

src/main/resources/config.yml

@@ -14,6 +14,16 @@ game-modes:
 # Players with the permission askyblock.island.multiplier.# will have their blocks
 # multiplied in value by that amount.
 
+# Include nether island in level calculations.
+# Warning: Enabling this mid-game will give players with an island a jump in
+# island level. New islands will be correctly zeroed.
+nether: false
+
+# Include end island in level calculations
+# Warning: Enabling this mid-game will give players with an island a jump in
+# island level. New islands will be correctly zeroed.
+end: false
+
 # Underwater block multiplier
 # If blocks are below sea-level, they can have a higher value. e.g. 2x
 # Promotes under-water development if there is a sea. Value can be fractional.