From 760178c061ea357bd5f03eef5a6b22412f7d759a Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Thu, 28 Jan 2016 13:37:21 -0500 Subject: [PATCH] Give custom perk boost the highest priority. --- .../java/com/gmail/nossr50/util/skills/PerksUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java index 878b40b0c..03f4ebe8c 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java @@ -45,7 +45,10 @@ public final class PerksUtils { } public static float handleXpPerks(Player player, float xp, SkillType skill) { - if (Permissions.quadrupleXp(player, skill)) { + if (Permissions.customXpBoost(player, skill)) { + xp *= ExperienceConfig.getInstance().getCustomXpPerkBoost(); + } + else if (Permissions.quadrupleXp(player, skill)) { xp *= 4; } else if (Permissions.tripleXp(player, skill)) { @@ -63,9 +66,6 @@ public final class PerksUtils { else if (Permissions.oneAndOneTenthXp(player, skill)) { xp *= 1.1; } - else if (Permissions.customXpBoost(player, skill)) { - xp *= ExperienceConfig.getInstance().getCustomXpPerkBoost(); - } return xp; }