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 5a30e838d0..b091e65375 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 5a30e838d0..b091e65375 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 c917cdb5bc..3f1409435f 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 c917cdb5bc..3f1409435f 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 5de204e77a..3a2b5d9df2 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 5de204e77a..3a2b5d9df2 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 5de204e77a..3a2b5d9df2 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4397,15 +4397,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 96357ad4e5..3f39fa7788 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4396,15 +4396,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 40b1e450a1..c33a73dd84 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,15 +4387,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 40b1e450a1..c33a73dd84 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,15 +4387,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 47d84064ed..e195d00638 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,15 +4387,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 816d651d38..0d4ffab4a7 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4400,15 +4400,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 816d651d38..0d4ffab4a7 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4400,15 +4400,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 7b6d7db0d0..caaf0a74fd 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4399,15 +4399,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;
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 40b1e450a1..c33a73dd84 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) && (player != target))
+			if (player != null)
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);
@@ -4387,15 +4387,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Start attack stance and notify being attacked.
-		if ((this != target))
+		if (target.hasAI())
 		{
-			if (target.hasAI())
-			{
-				target.getAI().clientStartAutoAttack();
-				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
-			}
-			getAI().clientStartAutoAttack();
+			target.getAI().clientStartAutoAttack();
+			target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
 		}
+		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
 		double damage = damageValue;