From fa34d06341079285dfc96fe534177f54dd53ef2b Mon Sep 17 00:00:00 2001 From: riking Date: Fri, 27 Sep 2013 15:46:19 -0700 Subject: [PATCH] Clear child skill FamilyTree on reload --- src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java | 2 ++ src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java index 6db8dcc3a..d434bc1a7 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java @@ -18,6 +18,8 @@ public class ChildConfig extends AutoUpdateConfigLoader { protected void loadKeys() { config.setDefaults(YamlConfiguration.loadConfiguration(plugin.getResource("child.yml"))); + FamilyTree.clearRegistrations(); // when reloading, need to clear statics + for (SkillType skill : SkillType.childSkills()) { plugin.debug("Finding parents of " + skill.name()); diff --git a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java index 49d597812..bb3842b01 100644 --- a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java +++ b/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java @@ -35,6 +35,10 @@ public class FamilyTree { } } + protected static void clearRegistrations() { + tree.clear(); + } + protected static void enforceChildSkill(SkillType skill) { if (!skill.isChildSkill()) { throw new IllegalArgumentException(skill.name() + " is not a child skill!");