Merge branch 'copilot/fix-751a9037-3a32-417b-8065-948a85ffe2bd' of github.com:Dans-Plugins/SimpleSkills into copilot/fix-751a9037-3a32-417b-8065-948a85ffe2bd

Author: BuildTools

src/main/java/dansplugins/simpleskills/commands/ForceCommand.java

@@ -91,7 +91,7 @@ private boolean forceActivate(CommandSender commandSender, String skillName) {
         }
         skill.setActive(true);
         configService.setSkillActive(skill.getName(), true);
-        commandSender.sendMessage(ChatColor.GREEN + "The '" + skill.getName() + "' is now active.");
+        commandSender.sendMessage(ChatColor.GREEN + "The '" + skill.getName() + "' skill is now active. A server restart is required for this change to take full effect.");
         return true;
     }
 
@@ -111,7 +111,7 @@ private boolean forceDeactivate(CommandSender commandSender, String skillName) {
         }
         skill.setActive(false);
         configService.setSkillActive(skill.getName(), false);
-        commandSender.sendMessage(ChatColor.GREEN + "The '" + skill.getName() + "' is now inactive.");
+        commandSender.sendMessage(ChatColor.GREEN + "The '" + skill.getName() + "' skill is now inactive.");
         return true;
     }
 }

src/main/java/dansplugins/simpleskills/skill/abs/AbstractSkill.java

@@ -83,7 +83,7 @@ public AbstractSkill(ConfigService configService, Log log, PlayerRecordRepositor
         if (triggers.length == 0) throw new IllegalArgumentException("Skill cannot have zero triggers.");
         this.name = name;
         // Read activation state from config, default to true for backward compatibility
-        this.active = this.configService.getConfig().getBoolean("skills." + name + ".active", true);
+        this.active = this.configService.getConfig().getBoolean("skills." + getName() + ".active", true);
         this.expReq = this.configService.getConfig().getInt("defaultBaseExperienceRequirement", 10);
         this.expFactor = this.configService.getConfig().getDouble("defaultDefaultExperienceIncreaseFactor", 1.2);
         setupTriggers(triggers);
@@ -128,6 +128,7 @@ private void setupTriggers(@NotNull Class<? extends Event>[] triggers) {
      * @param event to handle.
      */
     public void handle(Event event) {
+        if (!active) return;
         if (calledEvents.contains(event)) return;
         calledEvents.add(event);
         if (event instanceof Cancellable) if (((Cancellable) event).isCancelled()) return;

src/main/resources/config.yml

@@ -36,7 +36,7 @@ skills:
     active: true
   Mining:
     active: true
-  MonsterHunting:
+  "Monster Hunting":
     active: true
   Pyromaniac:
     active: true
@@ -46,5 +46,5 @@ skills:
     active: true
   Strength:
     active: true
-  Woodcutting:
+  Lumberjack:
     active: true