Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-24 01:27:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues in the ExperienceBarWrapper

Browse Source
This commit is contained in:
nossr50 2019-06-01 03:23:08 -07:00
parent 9dfbb14c39
commit 4e7e2daf3c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.skills.axes; package com.gmail.nossr50.skills.axes;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

11
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
View File

@ -21,21 +21,14 @@ public class ExperienceBarWrapper {
protected final McMMOPlayer mcMMOPlayer; protected final McMMOPlayer mcMMOPlayer;
private final PrimarySkillType primarySkillType; //Primary Skill private final PrimarySkillType primarySkillType; //Primary Skill
<<<<<<< HEAD
private final Server server;
=======
private BossBar bossBar; private BossBar bossBar;
protected final McMMOPlayer mcMMOPlayer;
private int lastLevelUpdated; private int lastLevelUpdated;
>>>>>>> 9111590dc2a9bb6a1c12fefc13167a1d88470cd4
/* /*
* This is stored to help optimize updating the title * This is stored to help optimize updating the title
*/ */
protected String niceSkillName; protected String niceSkillName;
protected String title; protected String title;
private BossBar bossBar;
private int lastLevelUpdated;
public ExperienceBarWrapper(PrimarySkillType primarySkillType, McMMOPlayer mcMMOPlayer) { public ExperienceBarWrapper(PrimarySkillType primarySkillType, McMMOPlayer mcMMOPlayer) {
this.mcMMOPlayer = mcMMOPlayer; this.mcMMOPlayer = mcMMOPlayer;
@ -129,10 +122,10 @@ public class ExperienceBarWrapper {
bossBar.setProgress(v); bossBar.setProgress(v);
//Check player level //Check player level
if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) { if(mcMMO.getConfigManager().getConfigLeveling().getEarlyGameBoost().isEnableEarlyGameBoost() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mcMMOPlayer, primarySkillType)) {
setColor(BarColor.YELLOW); setColor(BarColor.YELLOW);
} else { } 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 //Every time progress updates we need to check for a title update