diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java
index 78409150..a5d2ca1e 100644
--- a/src/main/java/net/Indyuce/mmocore/MMOCore.java
+++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java
@@ -276,7 +276,7 @@ public class MMOCore extends LuminePlugin {
 		Bukkit.getPluginManager().registerEvents(new FishingListener(), this);
 		Bukkit.getPluginManager().registerEvents(new PlayerCollectStats(), this);
 		Bukkit.getPluginManager().registerEvents(new PlayerPressKeyListener(), this);
-		Bukkit.getPluginManager().registerEvents(new ClassTriggers(), this);
+		// Bukkit.getPluginManager().registerEvents(new ClassTriggers(), this);
 
 		/*
 		 * Initialize player data from all online players. This is very important to do
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
index dc4b1090..afded88e 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
@@ -21,6 +21,8 @@ import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
 import net.Indyuce.mmocore.experience.provider.ExperienceDispenser;
 import net.Indyuce.mmocore.experience.provider.MainExperienceDispenser;
 import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
+import net.Indyuce.mmocore.player.playerclass.ClassTrigger;
+import net.Indyuce.mmocore.player.playerclass.ClassTriggerType;
 import net.Indyuce.mmocore.skill.ClassSkill;
 import net.Indyuce.mmocore.skill.RegisteredSkill;
 import net.md_5.bungee.api.ChatColor;
@@ -51,7 +53,10 @@ public class PlayerClass extends PostLoadObject implements ExperienceObject {
     private final Map<StatType, LinearValue> stats = new HashMap<>();
     private final Map<String, ClassSkill> skills = new LinkedHashMap<>();
     private final List<Subclass> subclasses = new ArrayList<>();
-    // private final Map<String, ClassTrigger> classTriggers = new HashMap<>();
+
+    @Deprecated
+    private final Map<String, ClassTrigger> classTriggers = new HashMap<>();
+
     private final Map<PlayerResource, ResourceRegeneration> resourceHandlers = new HashMap<>();
 
     @Deprecated
@@ -293,10 +298,11 @@ public class PlayerClass extends PostLoadObject implements ExperienceObject {
         return options.containsKey(option) ? options.get(option) : option.getDefault();
     }
 
-    // @Nullable
-    // public ClassTrigger getClassTrigger(ClassTriggerType type) {
-    //     return classTriggers.get(type);
-    // }
+    @Nullable
+    @Deprecated
+    public ClassTrigger getClassTrigger(ClassTriggerType type) {
+        return classTriggers.get(type);
+    }
 
     @Deprecated
     public Set<String> getEventTriggers() {
diff --git a/src/main/java/net/Indyuce/mmocore/player/playerclass/ClassTrigger.java b/src/main/java/net/Indyuce/mmocore/player/playerclass/ClassTrigger.java
index ea21fbd0..a18649f8 100644
--- a/src/main/java/net/Indyuce/mmocore/player/playerclass/ClassTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/player/playerclass/ClassTrigger.java
@@ -53,7 +53,6 @@ public class ClassTrigger {
         return type;
     }
 
-    @Deprecated
     public SkillResult trigger(TriggerMetadata triggerMeta) {
         return castableSkill.cast(triggerMeta);
     }