Don't apply attack power modification if the damage being done is ski…

…ll damage. Let Fabled take care of *when* attacks can happen
magemonkeystudio · Jan 26, 2025 · ebde85c · ebde85c
1 parent 4991b92
commit ebde85c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java b/src/main/java/studio/magemonkey/divinity/hooks/external/FabledHook.java
@@ -1,5 +1,6 @@
 package studio.magemonkey.divinity.hooks.external;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -163,6 +164,14 @@ public boolean ignoreDivinity(LivingEntity player) {
         return divinityIgnored.contains(player.getUniqueId());
     }
 
+    public boolean isSkillDamage() {
+        if (!Bukkit.getPluginManager().isPluginEnabled("Fabled")) {
+            return false;
+        }
+
+        return Skill.isSkillDamage();
+    }
+
     public void addSkill(Player player, String skillId, int level) {
         PlayerData playerData = Fabled.getData(player);
         Skill      skill      = Fabled.getSkill(skillId);

diff --git a/src/main/java/studio/magemonkey/divinity/manager/damage/DamageManager.java b/src/main/java/studio/magemonkey/divinity/manager/damage/DamageManager.java
@@ -33,6 +33,8 @@
 import studio.magemonkey.divinity.api.PartyAPI;
 import studio.magemonkey.divinity.api.event.DivinityDamageEvent;
 import studio.magemonkey.divinity.config.EngineCfg;
+import studio.magemonkey.divinity.hooks.EHook;
+import studio.magemonkey.divinity.hooks.external.FabledHook;
 import studio.magemonkey.divinity.hooks.external.mythicmobs.AbstractMythicMobsHK;
 import studio.magemonkey.divinity.manager.effects.main.AdjustStatEffect;
 import studio.magemonkey.divinity.manager.effects.main.DisarmEffect;
@@ -217,6 +219,11 @@ public void onDamageRPGStart(@NotNull DivinityDamageEvent.Start e) {
         double powerMod = metadata == null || metadata.isEmpty()
                 ? (statsDamager != null ? statsDamager.getAttackPowerModifier() : 1D)
                 : metadata.get(0).asInt();
+        FabledHook skillApi = (FabledHook) Divinity.getInstance().getHook(EHook.SKILL_API);
+        if (skillApi != null && skillApi.isSkillDamage() && damager != null && !skillApi.ignoreDivinity(damager)) {
+            powerMod = 1;
+        }
+
         double directMod        = meta.getDirectModifier();
         double critMod          = meta.getCriticalModifier();
         double blockMod         = meta.getBlockModifier();