3.2.6 b576

* fixed rule allowed-worldguard-regions breaking levelling on regions outside of the list
ArcanePlugins · Nov 30, 2021 · 7806d98 · 7806d98
1 parent 61dd4d4
commit 7806d98
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>me.lokka30</groupId>
     <artifactId>LevelledMobs</artifactId>
-    <version>3.2.6 b575</version>
+    <version>3.2.6 b576</version>
     <packaging>jar</packaging>
 
     <name>LevelledMobs</name>

diff --git a/src/main/java/me/lokka30/levelledmobs/managers/ExternalCompatibilityManager.java b/src/main/java/me/lokka30/levelledmobs/managers/ExternalCompatibilityManager.java
@@ -19,6 +19,7 @@
 import org.jetbrains.annotations.Nullable;
 import simplepets.brainsynder.api.plugin.SimplePets;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -337,9 +338,9 @@ public static boolean isMobOfShopkeepers(final @NotNull LivingEntityWrapper lmEn
         return isExternalType;
     }
 
-    @Nullable
+    @NotNull
     public static List<String> getWGRegionsAtLocation(@NotNull final LivingEntityInterface lmInterface){
-        if (!ExternalCompatibilityManager.hasWorldGuardInstalled()) return null;
+        if (!ExternalCompatibilityManager.hasWorldGuardInstalled()) return Collections.emptyList();
 
         return WorldGuardIntegration.getWorldGuardRegionsForLocation(lmInterface);
     }

diff --git a/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java b/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java
@@ -644,12 +644,12 @@ private boolean isRuleApplicable_Entity(final LivingEntityWrapper lmEntity, @Not
         if (ri.conditions_WGRegions != null){
             boolean isInList = false;
             final List<String> wgRegions = ExternalCompatibilityManager.getWGRegionsAtLocation(lmInterface);
-            if (wgRegions != null) {
-                for (final String regionName : wgRegions) {
-                    if (ri.conditions_WGRegions.isEnabledInList(regionName, null)) {
-                        isInList = true;
-                        break;
-                    }
+            if (wgRegions.isEmpty()) wgRegions.add("(none)");
+
+            for (final String regionName : wgRegions) {
+                if (ri.conditions_WGRegions.isEnabledInList(regionName, null)) {
+                    isInList = true;
+                    break;
                 }
             }