diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
index 60de8e0a69550299a8ca60cc02e383cd2f37a062..93b552fa8dfe5796e238c9642d43d1ddd788f986 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
@@ -79,7 +79,7 @@ public final class Backstab extends AbstractEffect
}
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), true);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), true, false);
// Manage attack or cast break of the target (calculating rate, sending message...)
if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
index 0ea4b13c78dfa78903ffce43c170c2523d1f027f..fba1a8b3094a5cda7b597a0bcc3c33ab3f8b10bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
@@ -72,7 +72,7 @@ public final class CpDamPercent extends AbstractEffect
if (info.getEffected() != info.getEffector())
{
info.getEffector().sendDamageMessage(info.getEffected(), damage, false, false, false);
- info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+ info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, false);
}
}
// Check if damage should be reflected
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
index 2d29dda1e39f8ba7980d2fb85a65cb66a32d4c9e..0f7ae423c09cb35ce82be1cac3194407d2c6152c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
@@ -74,7 +74,7 @@ public final class DamOverTime extends AbstractEffect
}
info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
- info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+ info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
return info.getSkill().isToggle();
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index b40cbf2c5ed63846e461c252c393408602fa2ada..4deae41ef01f09b8947edb4230b88126527e239e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -75,7 +75,7 @@ public final class DamOverTimePercent extends AbstractEffect
}
}
info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
- info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+ info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
return info.getSkill().isToggle();
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
index 2ab8d4fe481aaa40d8999ebfd3e7371a844bab94..35be7721ec888a56ca78475a9c24fa730ab5bc61 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
@@ -88,12 +88,12 @@ public final class DeathLink extends AbstractEffect
if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
{
activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+ activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
}
else
{
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
index aea5c3cb6295a5d032075cd9bb9f80a3606d9262..b4869cbc7d5360edd37da6de24d8e067cce9c8aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
@@ -158,7 +158,7 @@ public final class EnergyAttack extends AbstractEffect
{
attacker.sendDamageMessage(target, (int) damage, false, critical, false);
target.reduceCurrentHp(damage, attacker, skill);
- target.notifyDamageReceived(damage, attacker, skill, critical);
+ target.notifyDamageReceived(damage, attacker, skill, critical, false);
// Check if damage should be reflected
Formulas.calcDamageReflected(attacker, target, skill, critical);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
index eb871433065b7c09de23909c7226a1fa0f77eca4..e0eb307ab2d020e3d9f7fd307dbe50d858b98611 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
@@ -81,7 +81,7 @@ public final class FatalBlow extends AbstractEffect
}
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
// Manage attack or cast break of the target (calculating rate, sending message...)
if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
index ef3442cae3ef3e5fc087a1528c9eec9161f04a3e..70c21fd1fcd6121da8a9bbd1866e8477b3b5cf57 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
@@ -99,7 +99,7 @@ public final class HpDrain extends AbstractEffect
}
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
}
}
}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
index a76862c140456b9b273ed84f29c6633f5aa2daaf..4221671a578404a3785f10cc8ab5c1c9abf9d191 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
@@ -83,7 +83,7 @@ public final class Lethal extends AbstractEffect
// for Players CP and HP is set to 1.
if (target.isPlayer())
{
- target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true);
+ target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true, false);
target.setCurrentCp(1);
target.setCurrentHp(1);
target.sendPacket(SystemMessageId.LETHAL_STRIKE);
@@ -91,7 +91,7 @@ public final class Lethal extends AbstractEffect
// for Monsters HP is set to 1.
else if (target.isMonster() || target.isSummon())
{
- target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true);
+ target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true, false);
target.setCurrentHp(1);
}
activeChar.sendPacket(SystemMessageId.LETHAL_STRIKE_SUCCESSFUL);
@@ -109,7 +109,7 @@ public final class Lethal extends AbstractEffect
// for Monsters HP is set to 50%.
else if (target.isMonster() || target.isSummon())
{
- target.notifyDamageReceived(target.getCurrentHp() * 0.5, info.getEffector(), info.getSkill(), true);
+ target.notifyDamageReceived(target.getCurrentHp() * 0.5, info.getEffector(), info.getSkill(), true, false);
target.setCurrentHp(target.getCurrentHp() * 0.5);
}
activeChar.sendPacket(SystemMessageId.HALF_KILL);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
index 83a0a80de0e93d11f78a0586bdda20f6be0bfc63..fd6aa35f742753ce5324773762c92ad2348a95c6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
@@ -88,12 +88,12 @@ public final class MagicalAttack extends AbstractEffect
if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
{
activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+ activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
}
else
{
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
index 299f763dbc8374d5ac3845bb8a6ffbd2ca2b6076..82461ecc90bf50cf5d483f9f7b68d32010e45fc3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
@@ -100,12 +100,12 @@ public final class MagicalSoulAttack extends AbstractEffect
if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
{
activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+ activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
}
else
{
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
index a97f46555126633768e3c450bea5f5761336045c..0207e352dc274b5fee401bfc2a2412504eb42a19 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
@@ -104,7 +104,7 @@ public final class PhysicalAttack extends AbstractEffect
{
activeChar.sendDamageMessage(target, damage, false, crit, false);
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
// Check if damage should be reflected
Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
index 51266ddee67b237ec4ac25449865cafc6f7054c3..f7bdda23211e8c244d5b6f4b1cf4613cfdc73051 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
@@ -94,7 +94,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{
activeChar.sendDamageMessage(target, damage, false, crit, false);
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
// Check if damage should be reflected.
Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
index 80644c5a16d557f4a532e9a5c4fd756c19430c32..3c796ead08e518166b8ad83e06907d4c3e04550c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
@@ -110,7 +110,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{
activeChar.sendDamageMessage(target, damage, false, crit, false);
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
// Check if damage should be reflected
Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
index d6980fa99312738fadf3d3725973137cfd051ea5..b9f9b7527f5c39ad2d67bd9525d83351cd077ad6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
@@ -90,7 +90,7 @@ public final class SoulBlow extends AbstractEffect
}
target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+ target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
// Manage attack or cast break of the target (calculating rate, sending message...)
if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
index 0a13cadc17e330373bab7665f7e276552efa8854..302ce8c5a670236b971d680a9c894a68ca490f5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
@@ -56,7 +56,7 @@ public final class StaticDamage extends AbstractEffect
}
info.getEffected().reduceCurrentHp(getValue(), info.getEffector(), info.getSkill());
- info.getEffected().notifyDamageReceived(getValue(), info.getEffector(), info.getSkill(), false);
+ info.getEffected().notifyDamageReceived(getValue(), info.getEffector(), info.getSkill(), false, false);
if (info.getEffector().isPlayer())
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index 50d1885daf3b8372cbf04d5d70394b9e7bca88ec..5d3035df5c4e797a4b6fc2e29b45972ded860eac 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -60,9 +60,9 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
}
@Override
- public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit)
+ public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit, boolean damageOverTime)
{
- if ((_chance == 0) || (_skill.getSkillLvl() == 0))
+ if (damageOverTime || (_chance == 0) || (_skill.getSkillLvl() == 0))
{
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
index 078de85fa1ef68c49117c6cfbdf7a4232bbb65c9..dd58298ce6ac1a4dbff0d8b035af3e4b1f9d3e24 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java
@@ -54,7 +54,7 @@ public class BallistaBomb implements ISkillHandler
{
target.setIsInvul(false);
target.reduceCurrentHp(target.getMaxHp() + 1, activeChar, skill);
- target.notifyDamageReceived(target.getMaxHp() + 1, activeChar, skill, false);
+ target.notifyDamageReceived(target.getMaxHp() + 1, activeChar, skill, false, false);
}
}
}