diff --git a/src/main/java/studio/magemonkey/divinity/hooks/HookListener.java b/src/main/java/studio/magemonkey/divinity/hooks/HookListener.java index c399cb33..96e511e2 100644 --- a/src/main/java/studio/magemonkey/divinity/hooks/HookListener.java +++ b/src/main/java/studio/magemonkey/divinity/hooks/HookListener.java @@ -6,6 +6,7 @@ import studio.magemonkey.divinity.hooks.external.*; import studio.magemonkey.divinity.hooks.external.mythicmobs.MythicMobsHK; import studio.magemonkey.divinity.hooks.external.mythicmobs.MythicMobsHKv5; +import studio.magemonkey.divinity.modules.list.itemgenerator.ItemGeneratorManager; import studio.magemonkey.divinity.modules.list.party.PartyManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -73,6 +74,10 @@ public void onPluginEnable(PluginEnableEvent event) { fabledHook.updateSkills(player); } } + ItemGeneratorManager itemgen = Divinity.getInstance() + .getModuleManager() + .getModule(ItemGeneratorManager.class); + if (itemgen != null) itemgen.reload(); // Load missed Fabled attributes break; } } diff --git a/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java b/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java index ff46932d..7bea0c93 100644 --- a/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java +++ b/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java @@ -43,6 +43,10 @@ public FabledHook(@NotNull Divinity plugin) { super(plugin); } + public boolean isFabledLoaded() { + return Fabled.isLoaded(); + } + @Override @NotNull public HookState setup() { diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java index 1b7ee316..28d06e31 100644 --- a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java +++ b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java @@ -536,7 +536,7 @@ public GeneratorItem(@NotNull Divinity plugin, @NotNull JYML cfg) { this.addAttributeGenerator(new AttributeGenerator<>(this.plugin, this, "generator.fabled-attributes.", - fabledHook == null ? List.of() : fabledHook.getAttributes(), + fabledHook != null && fabledHook.isFabledLoaded() ? fabledHook.getAttributes() : List.of(), ItemGeneratorManager.PLACE_GEN_FABLED_ATTR)); if (fabledHook != null) { cfg.addMissing("generator.fabled-attributes", commonItemGenerator.get("generator.fabled-attributes")); diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index baee6807..bd0b2483 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -7,6 +7,7 @@ provides: api-version: '1.19' authors: - Travja + - Sentropic - goflish description: The most advanced, customizable and configurable RPG-Core plugin! libraries: [ org.apache.commons:commons-lang3:${apache.version} ] diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 4e9043fb..1360806a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ main: studio.magemonkey.divinity.Divinity version: ${project.version} name: ${project.name} -authors: [ Travja, goflish ] +authors: [ Travja, Sentropic, goflish ] description: The most advanced, customizable and configurable RPG-Core plugin! libraries: [ org.apache.commons:commons-lang3:${apache.version} ] depend: [ Codex ]