From b0cab10da274aad2983abd12c97869703f70ca19 Mon Sep 17 00:00:00 2001
From: Ka0rX <guillaume.martinf@gmail.com>
Date: Thu, 4 May 2023 10:05:38 +0100
Subject: [PATCH] Fixed issue #811.

---
 .../java/net/Indyuce/mmocore/api/player/PlayerData.java   | 7 ++++++-
 .../src/main/java/net/Indyuce/mmocore/gui/SkillList.java  | 8 +++-----
 .../java/net/Indyuce/mmocore/skill/CastableSkill.java     | 5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
index 3b446677..a8774c5f 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
@@ -1073,6 +1073,11 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
         return getProfess().hasSkill(skill.getHandler().getId()) && hasSkillUnlocked(getProfess().getSkill(skill.getHandler().getId()));
     }
 
+
+    @Deprecated
+    public boolean hasSkillUnlocked(ClassSkill skill) {
+        return hasUnlockedLevel(skill);
+    }
     /**
      * Checks for the player's level and compares it to the skill unlock level.
      * <p>
@@ -1083,7 +1088,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
      *
      * @return If the player unlocked the skill
      */
-    public boolean hasSkillUnlocked(ClassSkill skill) {
+    public boolean hasUnlockedLevel(ClassSkill skill){
         return getLevel() >= skill.getUnlockLevel();
     }
 
diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/SkillList.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
index 7dfeb3c8..0284aea4 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
@@ -1,10 +1,8 @@
 package net.Indyuce.mmocore.gui;
 
-import io.lumine.mythic.core.utils.MythicUtil;
 import io.lumine.mythic.lib.MythicLib;
 import io.lumine.mythic.lib.api.item.ItemTag;
 import io.lumine.mythic.lib.api.item.NBTItem;
-import me.ulrich.clans.manager.I;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.SoundEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
@@ -442,7 +440,7 @@ public class SkillList extends EditableInventory {
                     return;
                 }
 
-                if (!playerData.hasSkillUnlocked(selected)) {
+                if (!playerData.hasUnlockedLevel(selected)) {
                     MMOCore.plugin.configManager.getSimpleMessage("skill-level-not-met").send(player);
                     player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 2);
                     return;
@@ -470,8 +468,8 @@ public class SkillList extends EditableInventory {
             if (item.getFunction().equals("upgrade")) {
                 int shiftCost = ((UpgradeItem) item).shiftCost;
 
-                if (!playerData.hasSkillUnlocked(selected)) {
-                    MMOCore.plugin.configManager.getSimpleMessage("not-unlocked-skill").send(player);
+                if (!playerData.hasUnlockedLevel(selected)) {
+                    MMOCore.plugin.configManager.getSimpleMessage("skill-level-not-met").send(player);
                     player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 2);
                     return;
                 }
diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java
index fdff5f3c..77d0dbfb 100644
--- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java
+++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java
@@ -1,7 +1,6 @@
 package net.Indyuce.mmocore.skill;
 
 import io.lumine.mythic.lib.MythicLib;
-import io.lumine.mythic.lib.api.player.MMOPlayerData;
 import io.lumine.mythic.lib.comp.flags.CustomFlag;
 import io.lumine.mythic.lib.player.cooldown.CooldownInfo;
 import io.lumine.mythic.lib.skill.Skill;
@@ -48,8 +47,8 @@ public class CastableSkill extends Skill {
         boolean loud = !getTrigger().isSilent();
 
         // Skill is not usable yet
-        if (!playerData.hasSkillUnlocked(skill)) {
-            if (loud) MMOCore.plugin.configManager.getSimpleMessage("not-unlocked-skill").send(playerData.getPlayer());
+        if (!playerData.hasUnlockedLevel(skill)) {
+            if (loud) MMOCore.plugin.configManager.getSimpleMessage("skill-level-not-met").send(playerData.getPlayer());
             return false;
         }