Merge pull request #378 from BentoBoxWorld/develop

Release 2.21.2

Author: tastybento

pom.xml

@@ -55,7 +55,7 @@
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.21.5-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>3.3.1</bentobox.version>
+        <bentobox.version>3.4.0</bentobox.version>
         <!-- Warps addon version -->
         <warps.version>1.12.0</warps.version>
         <!-- Visit addon version -->
@@ -67,7 +67,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>2.21.1</build.version>
+        <build.version>2.21.2</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

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

@@ -272,7 +272,7 @@ private List<String> getReport() {
         while (it.hasNext()) {
 
             Entry<Object> 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);

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;
     }