v3.4.0 b624

* fix behavior when using /lm summon with blacklisted mobs then they get unexpected high level attributes applied
ArcanePlugins · Mar 30, 2022 · 79bcc63 · 79bcc63
1 parent 2718592
commit 79bcc63
Show file tree

Hide file tree

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

diff --git a/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java b/src/main/java/me/lokka30/levelledmobs/rules/RulesManager.java
@@ -281,12 +281,19 @@ public int getRule_MobMinLevel(@NotNull final LivingEntityInterface lmInterface)
 
     public int getRule_MobMaxLevel(@NotNull final LivingEntityInterface lmInterface){
         int maxLevel = 0;
+        int firstMaxLevel = -1;
 
         for (final RuleInfo ruleInfo : lmInterface.getApplicableRules()) {
-            if (ruleInfo.restrictions_MaxLevel != null) maxLevel = ruleInfo.restrictions_MaxLevel;
+            if (ruleInfo.restrictions_MaxLevel != null) {
+                maxLevel = ruleInfo.restrictions_MaxLevel;
+                if (firstMaxLevel < 0 && maxLevel > 0) firstMaxLevel = maxLevel;
+            }
         }
 
         if (maxLevel <= 0 && lmInterface.getSummonedLevel() != null){
+            if (maxLevel == 0 && firstMaxLevel > 0)
+                maxLevel = firstMaxLevel;
+
             int summonedLevel = lmInterface.getSummonedLevel();
             if (summonedLevel > maxLevel) maxLevel = summonedLevel;
         }