Fix disabled traits not being fully disabled sometimes

Archy-X · Jun 12, 2024 · f5a289b · f5a289b
1 parent 6038965
commit f5a289b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/GatheringLuckTraits.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/GatheringLuckTraits.java
@@ -51,6 +51,7 @@ public double getBaseLevel(Player player, Trait trait) {
     }
 
     public void apply(Trait trait, Block block, Player player, User user, XpSource source) {
+        if (!trait.isEnabled()) return;
         // Get the skill corresponding to the block trait
         Skill skill = getSkill(trait);
         if (skill == null) return;

diff --git a/common/src/main/java/dev/aurelium/auraskills/common/user/User.java b/common/src/main/java/dev/aurelium/auraskills/common/user/User.java
@@ -221,6 +221,10 @@ public double getEffectiveTraitLevel(Trait trait) {
     }
 
     public double getBonusTraitLevel(Trait trait) {
+        if (!trait.isEnabled()) {
+            return 0.0;
+        }
+
         double level = 0.0;
         for (Stat stat : plugin.getTraitManager().getLinkedStats(trait)) {
             level += getStatLevel(stat) * stat.getTraitModifier(trait);