v3.8.1 b718

* fix mob multiplier merge behavior
ArcanePlugins · Oct 23, 2022 · 3b7defb · 3b7defb
1 parent 2c4c2dd
commit 3b7defb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>me.lokka30</groupId>
   <artifactId>LevelledMobs</artifactId>
-  <version>3.8.1 b717</version>
+  <version>3.8.1 b718</version>
   <packaging>jar</packaging>
   <name>LevelledMobs</name>
   <description>The Ultimate RPG Mob Levelling Plugin</description>

diff --git a/src/main/java/me/lokka30/levelledmobs/rules/RulesParsingManager.java b/src/main/java/me/lokka30/levelledmobs/rules/RulesParsingManager.java
@@ -1377,7 +1377,10 @@ private void parseFineTuning(final @Nullable ConfigurationSection cs) {
             return defaults;
         }
 
-        final FineTuningAttributes attribs = new FineTuningAttributes();
+        final boolean doMerge = ymlHelper.getBoolean(cs, "merge", true);
+
+        final FineTuningAttributes attribs = parsingInfo.allMobMultipliers != null && doMerge ?
+                parsingInfo.allMobMultipliers : new FineTuningAttributes();
 
         attribs.maxHealth = ymlHelper.getDouble2(cs, "max-health", attribs.maxHealth);
         attribs.movementSpeed = ymlHelper.getDouble2(cs, "movement-speed", attribs.movementSpeed);