diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java index 4ea3de6a2..4d5dfa26f 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java +++ b/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)); diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java b/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java index 0866d8173..f4d403a06 100644 --- a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java +++ b/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)); } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java index 619adc065..d84f749b3 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java +++ b/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; }