diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java
index a37df738e..8d3fdbd21 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java
@@ -80,6 +80,7 @@ public class AbilityHazard extends AbilityZone implements IAbilityHazard {
                 zoneHeight,
                 particleDensity, particleScale, animSpeed, lightningDensity,
                 getEffects());
+            entity.setSourceAbility(this);
 
             applyVisualToEntity(entity);
 
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java
index 1ed357d94..d309b9e66 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java
@@ -86,6 +86,7 @@ public class AbilityTrap extends AbilityZone implements IAbilityTrap {
                 particleDensity, particleScale, animSpeed, lightningDensity,
                 visible,
                 getEffects());
+            entity.setSourceAbility(this);
 
             applyVisualToEntity(entity);
 
diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java
index 51172d2e7..1cd553cd6 100644
--- a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java
+++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java
@@ -5,6 +5,7 @@ import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
+import kamkeel.npcs.controllers.AbilityController;
 import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect;
 import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper;
@@ -171,6 +172,8 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
     private transient int ticksSinceDamage = 0;
     private transient Set<Integer> damagedThisTick = new HashSet<>();
 
+    private transient Ability sourceAbility = null;
+
     private boolean previewMode = false;
     private EntityLivingBase previewOwner = null;
 
@@ -504,15 +507,28 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
 
         int previousHurtResistantTime = Ability.clearHurtResistanceIfNeeded(target, ignoreIFrames);
         try {
-            if (owner instanceof EntityNPCInterface) {
-                return target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), dmg);
-            } else if (owner instanceof EntityPlayer) {
-                return target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), dmg);
-            } else if (owner instanceof EntityLivingBase) {
-                return target.attackEntityFrom(DamageSource.causeMobDamage((EntityLivingBase) owner), dmg);
-            } else {
-                return target.attackEntityFrom(new NpcDamageSource("npc_ability", null), dmg);
+            // Route through ability extender (e.g. DBC Addon damage scaling)
+            boolean handled = false;
+            if (sourceAbility != null && owner instanceof EntityLivingBase) {
+                double dx = target.posX - posX;
+                double dz = target.posZ - posZ;
+                handled = AbilityController.Instance.fireOnAbilityDamage(
+                    sourceAbility, (EntityLivingBase) owner, target,
+                    dmg, 0.0f, 0.0f, dx, dz, 1.0f);
             }
+
+            if (!handled) {
+                if (owner instanceof EntityNPCInterface) {
+                    return target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), dmg);
+                } else if (owner instanceof EntityPlayer) {
+                    return target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), dmg);
+                } else if (owner instanceof EntityLivingBase) {
+                    return target.attackEntityFrom(DamageSource.causeMobDamage((EntityLivingBase) owner), dmg);
+                } else {
+                    return target.attackEntityFrom(new NpcDamageSource("npc_ability", null), dmg);
+                }
+            }
+            return true;
         } finally {
             Ability.restoreHurtResistanceIfNeeded(target, ignoreIFrames, previousHurtResistantTime);
         }
@@ -540,6 +556,14 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
         this.previewOwner = owner;
     }
 
+    public Ability getSourceAbility() {
+        return sourceAbility;
+    }
+
+    public void setSourceAbility(Ability ability) {
+        this.sourceAbility = ability;
+    }
+
     // ═══════════════════════════════════════════════════════════════════
     // RENDERING SUPPORT
     // ═══════════════════════════════════════════════════════════════════
diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java
index 6a0ac0db5..66f40c04f 100644
--- a/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java
+++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java
@@ -2,6 +2,7 @@ package kamkeel.npcs.entity;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.controllers.AbilityController;
 import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData;
 import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData;
@@ -217,12 +218,24 @@ public class EntityEnergyPanel extends EntityEnergyBarrier {
                 if (panelData.launchDamage > 0) {
                     int previousHurtResistantTime = Ability.clearHurtResistanceIfNeeded(target, ignoreIFrames);
                     try {
-                        if (owner instanceof EntityNPCInterface) {
-                            target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), panelData.launchDamage);
-                        } else if (owner instanceof EntityPlayer) {
-                            target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), panelData.launchDamage);
-                        } else {
-                            target.attackEntityFrom(DamageSource.generic, panelData.launchDamage);
+                        // Route through ability extender (e.g. DBC Addon damage scaling)
+                        boolean handled = false;
+                        if (sourceAbility != null && owner instanceof EntityLivingBase) {
+                            double dx = target.posX - posX;
+                            double dz = target.posZ - posZ;
+                            handled = AbilityController.Instance.fireOnAbilityDamage(
+                                sourceAbility, (EntityLivingBase) owner, target,
+                                panelData.launchDamage, panelData.launchKnockback, 0.0f, dx, dz, 1.0f);
+                        }
+
+                        if (!handled) {
+                            if (owner instanceof EntityNPCInterface) {
+                                target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), panelData.launchDamage);
+                            } else if (owner instanceof EntityPlayer) {
+                                target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), panelData.launchDamage);
+                            } else {
+                                target.attackEntityFrom(DamageSource.generic, panelData.launchDamage);
+                            }
                         }
                     } finally {
                         Ability.restoreHurtResistanceIfNeeded(target, ignoreIFrames, previousHurtResistantTime);
diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java
index 1b4992152..7ce8eeaf1 100644
--- a/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java
+++ b/src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java
@@ -2,6 +2,7 @@ package kamkeel.npcs.entity;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.controllers.AbilityController;
 import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData;
 import kamkeel.npcs.util.CNPCDebug;
@@ -312,14 +313,26 @@ public class EntityEnergySweeper extends EntityEnergyAbility {
         boolean ignoreIFrames = isIgnoreIFrames();
         int previousHurtResistantTime = Ability.clearHurtResistanceIfNeeded(target, ignoreIFrames);
         try {
-            if (owner instanceof EntityNPCInterface) {
-                target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), damage);
-            } else if (owner instanceof EntityPlayer) {
-                target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), damage);
-            } else if (owner instanceof EntityLivingBase) {
-                target.attackEntityFrom(DamageSource.causeMobDamage((EntityLivingBase) owner), damage);
-            } else {
-                target.attackEntityFrom(new NpcDamageSource("npc_ability", null), damage);
+            // Route through ability extender (e.g. DBC Addon damage scaling)
+            boolean handled = false;
+            if (sourceAbility != null && owner instanceof EntityLivingBase) {
+                double dx = target.posX - posX;
+                double dz = target.posZ - posZ;
+                handled = AbilityController.Instance.fireOnAbilityDamage(
+                    sourceAbility, (EntityLivingBase) owner, target,
+                    damage, 0.0f, 0.2f, dx, dz, 1.0f);
+            }
+
+            if (!handled) {
+                if (owner instanceof EntityNPCInterface) {
+                    target.attackEntityFrom(new NpcDamageSource("npc_ability", (EntityNPCInterface) owner), damage);
+                } else if (owner instanceof EntityPlayer) {
+                    target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) owner), damage);
+                } else if (owner instanceof EntityLivingBase) {
+                    target.attackEntityFrom(DamageSource.causeMobDamage((EntityLivingBase) owner), damage);
+                } else {
+                    target.attackEntityFrom(new NpcDamageSource("npc_ability", null), damage);
+                }
             }
         } finally {
             Ability.restoreHurtResistanceIfNeeded(target, ignoreIFrames, previousHurtResistantTime);