From 4e7e2daf3cbf0d2febf9770c69d216b0f1036b8d Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 1 Jun 2019 03:23:08 -0700
Subject: [PATCH] Fix issues in the ExperienceBarWrapper

---
 .../com/gmail/nossr50/skills/axes/AxesManager.java    |  1 -
 .../nossr50/util/experience/ExperienceBarWrapper.java | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
index 6679c496a..766539cd1 100644
--- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
@@ -1,6 +1,5 @@
 package com.gmail.nossr50.skills.axes;
 
-import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
index 96f9391d7..cc1158213 100644
--- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
+++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
@@ -21,21 +21,14 @@ public class ExperienceBarWrapper {
 
     protected final McMMOPlayer mcMMOPlayer;
     private final PrimarySkillType primarySkillType; //Primary Skill
-<<<<<<< HEAD
-    private final Server server;
-=======
     private BossBar bossBar;
-    protected final McMMOPlayer mcMMOPlayer;
     private int lastLevelUpdated;
 
->>>>>>> 9111590dc2a9bb6a1c12fefc13167a1d88470cd4
     /*
      * This is stored to help optimize updating the title
      */
     protected String niceSkillName;
     protected String title;
-    private BossBar bossBar;
-    private int lastLevelUpdated;
 
     public ExperienceBarWrapper(PrimarySkillType primarySkillType, McMMOPlayer mcMMOPlayer) {
         this.mcMMOPlayer = mcMMOPlayer;
@@ -129,10 +122,10 @@ public class ExperienceBarWrapper {
             bossBar.setProgress(v);
 
         //Check player level
-        if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) {
+        if(mcMMO.getConfigManager().getConfigLeveling().getEarlyGameBoost().isEnableEarlyGameBoost() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) {
            setColor(BarColor.YELLOW);
         } else {
-            setColor(ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType));
+            setColor(mcMMO.getConfigManager().getConfigLeveling().getConfigExperienceBars().getXPBarColor(primarySkillType));
         }
 
         //Every time progress updates we need to check for a title update