Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed onEnable() error with ChatColor lookup

Browse Source
This commit is contained in:
ASangarin 2019-09-03 11:39:16 +01:00
parent ae24ffccb6
commit 2a6417ad10
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
View File

@ -103,8 +103,8 @@ public class ConfigManager {
manaFull = getColorOrDefault("mana-whole", ChatColor.BLUE); manaFull = getColorOrDefault("mana-whole", ChatColor.BLUE);
manaHalf = getColorOrDefault("mana-half", ChatColor.AQUA); manaHalf = getColorOrDefault("mana-half", ChatColor.AQUA);
manaEmpty = getColorOrDefault("mana-empty", ChatColor.WHITE); manaEmpty = getColorOrDefault("mana-empty", ChatColor.WHITE);
staminaFull = getColorOrDefault("stamina-whole", ChatColor.BLUE); staminaFull = getColorOrDefault("stamina-whole", ChatColor.GREEN);
staminaHalf = getColorOrDefault("stamina-half", ChatColor.AQUA); staminaHalf = getColorOrDefault("stamina-half", ChatColor.DARK_GREEN);
staminaEmpty = getColorOrDefault("stamina-empty", ChatColor.WHITE); staminaEmpty = getColorOrDefault("stamina-empty", ChatColor.WHITE);
neededExp.clear(); neededExp.clear();
@ -124,13 +124,16 @@ public class ConfigManager {
} }
private ChatColor getColorOrDefault(String configKey, ChatColor defaultColor) { private ChatColor getColorOrDefault(String configKey, ChatColor defaultColor) {
ChatColor newColor = ChatColor.valueOf(MMOCore.plugin.getConfig().getString("resource-bar-colors." + configKey).toUpperCase()); ChatColor newColor;
try {
if(newColor != null) newColor = ChatColor.valueOf(MMOCore.plugin.getConfig().getString("resource-bar-colors." + configKey).toUpperCase());
return newColor; }
catch(Exception e) {
MMOCore.log(Level.WARNING, "Resource Bar color config '" + configKey + "' is invalid... Using default color!"); MMOCore.log(Level.WARNING, "Resource Bar color config '" + configKey + "' is invalid... Using default color.");
return defaultColor; newColor = defaultColor;
}
return newColor;
} }
public DecimalFormat newFormat(String pattern) { public DecimalFormat newFormat(String pattern) {