Datapack for triggers changes

https://bitbucket.org/l2jserver/l2j_server/commits/ba8baa87562ec16f0743a7d5ce923415637585c8

dist/game/data/scripts/handlers/effecthandlers/Backstab.java

@@ -80,7 +80,7 @@ public final class Backstab extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, skill);
-		target.notifyDamageReceived(damage, activeChar, skill, true, false);
+		target.notifyDamageReceived(damage, activeChar, skill, true, false, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java

@@ -77,7 +77,7 @@ public final class DamOverTime extends AbstractEffect
 		}
 		
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
+		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true, false);
 		return info.getSkill().isToggle();
 	}
 }

dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java

@@ -78,7 +78,7 @@ public final class DamOverTimePercent extends AbstractEffect
 			}
 		}
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
+		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true, false);
 		
 		return info.getSkill().isToggle();
 	}

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, false);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -159,7 +159,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, false);
+			target.notifyDamageReceived(damage, attacker, skill, critical, false, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(attacker, target, skill, critical);

dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java

@@ -81,7 +81,7 @@ public final class FatalBlow extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, skill);
-		target.notifyDamageReceived(damage, activeChar, skill, crit, false);
+		target.notifyDamageReceived(damage, activeChar, skill, crit, false, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

dist/game/data/scripts/handlers/effecthandlers/HpDrain.java

@@ -103,7 +103,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, false);
+			target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
 		}
 	}
 }
\ No newline at end of file

dist/game/data/scripts/handlers/effecthandlers/Lethal.java

@@ -79,7 +79,7 @@ public final class Lethal extends AbstractEffect
 			// for Players CP and HP is set to 1.
 			if (target.isPlayer())
 			{
-				target.notifyDamageReceived(target.getCurrentHp() - 1, activeChar, skill, true, false);
+				target.notifyDamageReceived(target.getCurrentHp() - 1, activeChar, skill, true, false, false);
 				target.setCurrentCp(1);
 				target.setCurrentHp(1);
 				target.sendPacket(SystemMessageId.LETHAL_STRIKE);
@@ -87,7 +87,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, activeChar, skill, true, false);
+				target.notifyDamageReceived(target.getCurrentHp() - 1, activeChar, skill, true, false, false);
 				target.setCurrentHp(1);
 			}
 			activeChar.sendPacket(SystemMessageId.LETHAL_STRIKE_SUCCESSFUL);
@@ -105,7 +105,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, activeChar, skill, true, false);
+				target.notifyDamageReceived(target.getCurrentHp() * 0.5, activeChar, skill, true, false, false);
 				target.setCurrentHp(target.getCurrentHp() * 0.5);
 			}
 			activeChar.sendPacket(SystemMessageId.HALF_KILL);

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, false);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java

@@ -90,12 +90,12 @@ public final class MagicalAttackByAbnormal 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, false);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java

@@ -93,12 +93,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, false);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -105,7 +105,7 @@ public final class PhysicalAttack extends AbstractEffect
 		{
 			activeChar.sendDamageMessage(target, damage, false, crit, false);
 			target.reduceCurrentHp(damage, activeChar, skill);
-			target.notifyDamageReceived(damage, activeChar, skill, crit, false);
+			target.notifyDamageReceived(damage, activeChar, skill, crit, false, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(activeChar, target, skill, crit);

dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -95,7 +95,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		{
 			activeChar.sendDamageMessage(target, damage, false, crit, false);
 			target.reduceCurrentHp(damage, activeChar, skill);
-			target.notifyDamageReceived(damage, activeChar, skill, crit, false);
+			target.notifyDamageReceived(damage, activeChar, skill, crit, false, false);
 			
 			// Check if damage should be reflected.
 			Formulas.calcDamageReflected(activeChar, target, skill, crit);

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, skill);
-			target.notifyDamageReceived(damage, activeChar, skill, crit, false);
+			target.notifyDamageReceived(damage, activeChar, skill, crit, false, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(activeChar, target, skill, crit);

dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java

@@ -81,7 +81,7 @@ public final class SoulBlow extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, info.getSkill());
-		target.notifyDamageReceived(damage, activeChar, info.getSkill(), false, false);
+		target.notifyDamageReceived(damage, activeChar, info.getSkill(), false, false, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java

@@ -53,7 +53,7 @@ public final class StaticDamage extends AbstractEffect
 		}
 		
 		info.getEffected().reduceCurrentHp(_power, info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(_power, info.getEffector(), info.getSkill(), false, false);
+		info.getEffected().notifyDamageReceived(_power, info.getEffector(), info.getSkill(), false, false, false);
 		
 		if (info.getEffector().isPlayer())
 		{

dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java

@@ -88,7 +88,7 @@ public final class TriggerSkillByAttack extends AbstractEffect
 	
 	public void onAttackEvent(OnCreatureDamageDealt event)
 	{
-		if ((event.getSkill() != null) || event.isDamageOverTime() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0)))
+		if ((event.getSkill() != null) || event.isDamageOverTime() || event.isReflect() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0)))
 		{
 			return;
 		}