Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable

Changelog.txt

@@ -164,6 +164,10 @@ Version 2.2.0
     Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
     Added API method to check if a skill was being level capped
 
+Version 2.1.54
+    Fixed a bug where the Skill 'Understanding the Art' was preventing vanilla experience orbs from furnaces
+    Fixed 'Understanding the Art' not correctly boosting vanilla XP from furnaces
+
 Version 2.1.53
     Fixed a critical bug where players earned too much XP
 

src/main/java/com/gmail/nossr50/listeners/InventoryListener.java

@@ -183,7 +183,8 @@ public class InventoryListener implements Listener {
             return;
         }
 
-        int exp = UserManager.getPlayer(player).getSmeltingManager().vanillaXPBoost(event.getExpToDrop());
+        int xpToDrop = event.getExpToDrop();
+        int exp = UserManager.getPlayer(player).getSmeltingManager().vanillaXPBoost(xpToDrop);
         event.setExpToDrop(exp);
     }
 

src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java

@@ -129,6 +129,6 @@ public class SmeltingManager extends SkillManager {
      * @return the vanilla XP multiplier
      */
     public int getVanillaXpMultiplier() {
-        return RankUtils.getRank(getPlayer(), SubSkillType.SMELTING_UNDERSTANDING_THE_ART);
+        return Math.max(1, RankUtils.getRank(getPlayer(), SubSkillType.SMELTING_UNDERSTANDING_THE_ART));
     }
 }