Fixing some redundancy

mcMMO-Dev · Jan 20, 2019 · b7b0ff1 · b7b0ff1
1 parent 96742e6
commit b7b0ff1
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -31,6 +31,11 @@ public static Config getInstance() {
         return instance;
     }
 
+    @Override
+    protected void loadKeys() {
+
+    }
+
     @Override
     protected boolean validateKeys() {
         // Validate all the settings!
@@ -236,9 +241,6 @@ protected boolean validateKeys() {
         return noErrorsInConfig(reason);
     }
 
-    @Override
-    protected void loadKeys() {}
-
     /*
      * GENERAL SETTINGS
      */
@@ -298,28 +300,28 @@ public MobHealthbarType getMobHealthbarDefault() {
     public boolean getShowAbilityNames() { return config.getBoolean("Scoreboard.Ability_Names", true); }
 
     public boolean getRankUseChat() { return config.getBoolean("Scoreboard.Types.Rank.Print", false); }
-    public boolean getRankUseBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Rank.Board", true); }
+    public boolean getRankUseBoard() { return config.getBoolean("Scoreboard.Types.Rank.Board", true); }
     public int getRankScoreboardTime() { return config.getInt("Scoreboard.Types.Rank.Display_Time", 10); }
 
     public boolean getTopUseChat() { return config.getBoolean("Scoreboard.Types.Top.Print", true); }
-    public boolean getTopUseBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Top.Board", true); }
+    public boolean getTopUseBoard() { return config.getBoolean("Scoreboard.Types.Top.Board", true); }
     public int getTopScoreboardTime() { return config.getInt("Scoreboard.Types.Top.Display_Time", 15); }
 
     public boolean getStatsUseChat() { return config.getBoolean("Scoreboard.Types.Stats.Print", true); }
-    public boolean getStatsUseBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Stats.Board", true); }
+    public boolean getStatsUseBoard() { return config.getBoolean("Scoreboard.Types.Stats.Board", true); }
     public int getStatsScoreboardTime() { return config.getInt("Scoreboard.Types.Stats.Display_Time", 10); }
 
     public boolean getInspectUseChat() { return config.getBoolean("Scoreboard.Types.Inspect.Print", true); }
-    public boolean getInspectUseBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Inspect.Board", true); }
+    public boolean getInspectUseBoard() { return config.getBoolean("Scoreboard.Types.Inspect.Board", true); }
     public int getInspectScoreboardTime() { return config.getInt("Scoreboard.Types.Inspect.Display_Time", 25); }
 
     public boolean getCooldownUseChat() { return config.getBoolean("Scoreboard.Types.Cooldown.Print", false); }
-    public boolean getCooldownUseBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Cooldown.Board", true); }
+    public boolean getCooldownUseBoard() { return config.getBoolean("Scoreboard.Types.Cooldown.Board", true); }
     public int getCooldownScoreboardTime() { return config.getInt("Scoreboard.Types.Cooldown.Display_Time", 41); }
 
     public boolean getSkillUseBoard() { return config.getBoolean("Scoreboard.Types.Skill.Board", true); }
     public int getSkillScoreboardTime() { return config.getInt("Scoreboard.Types.Skill.Display_Time", 30); }
-    public boolean getSkillLevelUpBoard() { return getScoreboardsEnabled() && config.getBoolean("Scoreboard.Types.Skill.LevelUp_Board", true); }
+    public boolean getSkillLevelUpBoard() { return config.getBoolean("Scoreboard.Types.Skill.LevelUp_Board", true); }
     public int getSkillLevelUpTime() { return config.getInt("Scoreboard.Types.Skill.LevelUp_Time", 5); }
 
     /* Database Purging */