diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
index f9c3e40e46..3bca38c945 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
@@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
 			return;
 		}
 		
-		if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
+		if (event.getDamage() < _minDamage)
 		{
 			return;
 		}
 		
-		if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
+		if ((_chance < 100) && (Rnd.get(100) > _chance))
+		{
+			return;
+		}
+		
+		if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
+		{
+			return;
+		}
+		
+		if (!event.getAttacker().getInstanceType().isType(_attackerType))
 		{
 			return;
 		}