diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1c96512428..5a30e838d0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1c96512428..5a30e838d0 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6675a4446f..c917cdb5bc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6675a4446f..c917cdb5bc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c9fab0c445..5de204e77a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c9fab0c445..5de204e77a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c9fab0c445..5de204e77a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,14 +4397,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 4bb21fadab..96357ad4e5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4396,14 +4396,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index f60e73befe..4ea4ad5ad2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,10 +71,10 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return info.getSkill().isToggle();
 				}
-				
 				damage = info.getEffected().getCurrentHp() - 1;
 			}
 		}
+		
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
 		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
 		return info.getSkill().isToggle();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index f60e73befe..4ea4ad5ad2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,10 +71,10 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return info.getSkill().isToggle();
 				}
-				
 				damage = info.getEffected().getCurrentHp() - 1;
 			}
 		}
+		
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
 		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
 		return info.getSkill().isToggle();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a2d0e70628..40b1e450a1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,14 +4387,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a2d0e70628..40b1e450a1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,14 +4387,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 84c5c975fd..47d84064ed 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,14 +4387,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a6d17e3c3a..816d651d38 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4400,14 +4400,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a6d17e3c3a..816d651d38 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4400,14 +4400,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 84b93ee8d5..7b6d7db0d0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4399,14 +4399,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
index 95e37d1b4b..5688e2bcb9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
@@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
 				{
 					return skill.isToggle();
 				}
-				
 				damage = effected.getCurrentHp() - 1;
 			}
 		}
 		
 		effector.doAttack(damage, effected, skill, true, false, false, false);
-		
 		return skill.isToggle();
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a2d0e70628..40b1e450a1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && (player != target))
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,14 +4387,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if (target.hasAI())
+		if ((this != target))
 		{
-			target.getAI().clientStartAutoAttack();
-			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			if (target.hasAI())
+			{
+				target.getAI().clientStartAutoAttack();
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
 		}
 		
-		getAI().clientStartAutoAttack();
-		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
 		if (target.isImmobilized())