diff --git a/pom.xml b/pom.xml index b282345..e3e9828 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.0.9 1.21.5-R0.1-SNAPSHOT - 3.3.1 + 3.4.0 1.12.0 @@ -67,7 +67,7 @@ -LOCAL - 2.21.1 + 2.21.2 BentoBoxWorld_Level bentobox-world https://sonarcloud.io diff --git a/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java b/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java index 6f2519b..78d1470 100644 --- a/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java +++ b/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java @@ -272,7 +272,7 @@ private List getReport() { while (it.hasNext()) { Entry type = it.next(); - Integer limit = addon.getBlockConfig().getLimit(type); + Integer limit = addon.getBlockConfig().getLimit(type.getElement()); String explain = ")"; reportLines.add(Util.prettifyText(type.toString()) + ": " + String.format("%,d", type.getCount()) + " blocks (max " + limit + explain); @@ -374,7 +374,10 @@ private int limitCountAndValue(Object obj) { } int count = limitCount.getOrDefault(obj, 0); + if (count > limit) { + // Add block to ofCount + this.results.ofCount.add(obj); return 0; } limitCount.put(obj, count + 1); diff --git a/src/main/java/world/bentobox/level/config/BlockConfig.java b/src/main/java/world/bentobox/level/config/BlockConfig.java index 82c6740..95d1217 100644 --- a/src/main/java/world/bentobox/level/config/BlockConfig.java +++ b/src/main/java/world/bentobox/level/config/BlockConfig.java @@ -19,6 +19,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.EntityType; +import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.hooks.ItemsAdderHook; import world.bentobox.level.Level; @@ -177,14 +178,15 @@ private void loadWorlds(YamlConfiguration blockValues2) { */ public Integer getLimit(Object obj) { if (obj instanceof Material m) { - return blockLimits.get(m.name()); + return blockLimits.get(m.getKey().getKey()); } if (obj instanceof EntityType et) { - return blockLimits.get(et.name().concat(SPAWNER)); + return blockLimits.get(et.name().toLowerCase(Locale.ENGLISH).concat(SPAWNER)); } if (obj instanceof String s) { return blockLimits.get(s); } + return null; }