From 47fd207ba84e5c4695d077e09bd166ba3cd5fc6a Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 13 Oct 2025 15:58:50 +0200 Subject: [PATCH] Fixed MMOCore generating skill files for non-public ML scripts --- .../command/builtin/mmocore/tree/OpenCommandNode.java | 2 +- .../java/net/Indyuce/mmocore/manager/SkillManager.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/builtin/mmocore/tree/OpenCommandNode.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/builtin/mmocore/tree/OpenCommandNode.java index 1217cb96..16420d20 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/builtin/mmocore/tree/OpenCommandNode.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/builtin/mmocore/tree/OpenCommandNode.java @@ -40,6 +40,6 @@ public class OpenCommandNode extends CommandTreeNode { } InventoryManager.SPECIFIC_TREE_VIEW.get(UtilityMethods.kebabCase(skillTree.getId())).newInventory(playerData).open(); - return explorer.success("Skill tree &6" + skillTree.getIcons() + "&e opened for player &6" + player.getName()); + return explorer.success("Skill tree &6" + skillTree.getName() + "&e opened for player &6" + player.getName()); } } diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java index e89f043a..23b286ee 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java @@ -100,6 +100,16 @@ public class SkillManager implements MMOCoreManager { // Load skills FileUtils.loadObjectsFromFolder(MMOCore.plugin, "skills", true, (name, config) -> { final SkillHandler handler = MythicLib.plugin.getSkills().getHandler(UtilityMethods.enumName(name)); + + try { + Validate.isTrue(handler == null); + for (var script : MythicLib.plugin.getSkills().getScripts()) + if (UtilityMethods.kebabCase(script.getId()).equals(name)) return; + } catch (Throwable ignored) { + // TODO j'ai chié dans la colle, plein de .yml en trop a cause des scripts non publics! + // A absolument enlever lors de la maj centralisation des skills ML/MMOItems/MMOCores + } + Validate.notNull(handler, "Could not find skill handler with ID '" + UtilityMethods.enumName(name) + "'"); final RegisteredSkill skill = new RegisteredSkill(handler, config); this.skills.put(handler.getId(), skill);