Stop skill effect check for TriggerSkillByHpPercent.

Contributed by petryxa.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java

@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -63,7 +64,14 @@ public class TriggerSkillByHpPercent extends AbstractEffect
 		final int hpPercent = creature.getCurrentHpPercent();
 		if ((hpPercent >= _percentFrom) && (hpPercent <= _percentTo))
 		{
-			SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			if (!creature.isAffectedBySkill(_skillId))
+			{
+				SkillCaster.triggerCast(creature, creature, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+			}
+		}
+		else
+		{
+			creature.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, _skillId);
 		}
 	}
 }