浏览代码

Move these functions to SkillType.

GJ 11 年之前
父节点
当前提交
9485869014

+ 2 - 2
src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -51,11 +51,11 @@ public class HardcoreCommand extends HardcoreModeCommand {
     private void toggle(boolean enable) {
         if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.nonChildSkills()) {
-                Config.getInstance().setHardcoreStatLossEnabled(skillType, enable);
+                skillType.setHardcoreStatLossEnabled(enable);
             }
         }
         else {
-            Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), enable);
+            SkillType.getSkill(skill).setHardcoreStatLossEnabled(enable);
         }
 
         mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));

+ 4 - 4
src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -48,16 +48,16 @@ public class VampirismCommand extends HardcoreModeCommand {
         sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
     }
 
-    private void toggle(boolean enabled) {
+    private void toggle(boolean enable) {
         if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.nonChildSkills()) {
-                Config.getInstance().setHardcoreVampirismEnabled(skillType, enabled);
+                skillType.setHardcoreVampirismEnabled(enable);
             }
         }
         else {
-            Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), enabled);
+            SkillType.getSkill(skill).setHardcoreVampirismEnabled(enable);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enabled ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
     }
 }

+ 8 - 0
src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java

@@ -109,10 +109,18 @@ public enum SkillType {
         return Config.getInstance().getHardcoreStatLossEnabled(this);
     }
 
+    public void setHardcoreStatLossEnabled(boolean enable) {
+        Config.getInstance().setHardcoreStatLossEnabled(this, enable);
+    }
+
     public boolean getHardcoreVampirismEnabled() {
         return Config.getInstance().getHardcoreVampirismEnabled(this);
     }
 
+    public void setHardcoreVampirismEnabled(boolean enable) {
+        Config.getInstance().setHardcoreVampirismEnabled(this, enable);
+    }
+
     public ToolType getTool() {
         return tool;
     }