From ffa35d017998a9423a5f306100ccba89800ef12c Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 14 Jun 2019 12:00:47 -0700
Subject: [PATCH] Fix leveling + Fix Roll

---
 .../config/hocon/skills/acrobatics/ConfigAcrobatics.java       | 2 +-
 .../nossr50/datatypes/skills/subskills/acrobatics/Roll.java    | 2 +-
 src/main/java/com/gmail/nossr50/listeners/SelfListener.java    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java
index 8174e9af2..6d4153a54 100644
--- a/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java
+++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/acrobatics/ConfigAcrobatics.java
@@ -24,7 +24,7 @@ public class ConfigAcrobatics {
         return subSkills.getDodge();
     }
 
-    public double getDamageTheshold() {
+    public double getRollDamageTheshold() {
         return getRoll().getDamageTheshold();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
index 7337b35bd..2b13d5d21 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
@@ -202,7 +202,7 @@ public class Roll extends AcrobaticsSubSkill {
             return gracefulRollCheck(player, mcMMOPlayer, damage, skillLevel);
         }
 
-        double modifiedDamage = calculateModifiedRollDamage(damage, AdvancedConfig.getInstance().getRollDamageThreshold());
+        double modifiedDamage = calculateModifiedRollDamage(damage, mcMMO.getConfigManager().getConfigAcrobatics().getRollDamageTheshold());
 
         if (!isFatal(player, modifiedDamage)
                 && RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.ACROBATICS_ROLL, player)) {
diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
index 1fbae1723..d22840b7d 100644
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -45,9 +45,6 @@ public class SelfListener implements Listener {
         if (mcMMO.getScoreboardSettings().getScoreboardsEnabled())
             ScoreboardManager.handleLevelUp(player, skill);
 
-        if (!MainConfig.getInstance().getLevelUpEffectsEnabled()) {
-        }
-
         /*if ((event.getSkillLevel() % Config.getInstance().getLevelUpEffectsTier()) == 0) {
             skill.celebrateLevelUp(player);
         }*/