diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5d451bfd89..81b89461fc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -187,17 +187,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				return false;
 			}
 			
-			if (me.isChampion() && Config.CHAMPION_PASSIVE)
-			{
-				return false;
-			}
-			
 			if (!me.isAggressive())
 			{
 				return false;
 			}
 		}
 		
+		if (me.isChampion() && Config.CHAMPION_PASSIVE)
+		{
+			return false;
+		}
+		
 		return target.isAutoAttackable(me) && GeoEngine.getInstance().canSeeTarget(me, target);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5d451bfd89..81b89461fc 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -187,17 +187,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				return false;
 			}
 			
-			if (me.isChampion() && Config.CHAMPION_PASSIVE)
-			{
-				return false;
-			}
-			
 			if (!me.isAggressive())
 			{
 				return false;
 			}
 		}
 		
+		if (me.isChampion() && Config.CHAMPION_PASSIVE)
+		{
+			return false;
+		}
+		
 		return target.isAutoAttackable(me) && GeoEngine.getInstance().canSeeTarget(me, target);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5d451bfd89..81b89461fc 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -187,17 +187,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				return false;
 			}
 			
-			if (me.isChampion() && Config.CHAMPION_PASSIVE)
-			{
-				return false;
-			}
-			
 			if (!me.isAggressive())
 			{
 				return false;
 			}
 		}
 		
+		if (me.isChampion() && Config.CHAMPION_PASSIVE)
+		{
+			return false;
+		}
+		
 		return target.isAutoAttackable(me) && GeoEngine.getInstance().canSeeTarget(me, target);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5d451bfd89..81b89461fc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -187,17 +187,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				return false;
 			}
 			
-			if (me.isChampion() && Config.CHAMPION_PASSIVE)
-			{
-				return false;
-			}
-			
 			if (!me.isAggressive())
 			{
 				return false;
 			}
 		}
 		
+		if (me.isChampion() && Config.CHAMPION_PASSIVE)
+		{
+			return false;
+		}
+		
 		return target.isAutoAttackable(me) && GeoEngine.getInstance().canSeeTarget(me, target);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
index 5d451bfd89..81b89461fc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
@@ -187,17 +187,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				return false;
 			}
 			
-			if (me.isChampion() && Config.CHAMPION_PASSIVE)
-			{
-				return false;
-			}
-			
 			if (!me.isAggressive())
 			{
 				return false;
 			}
 		}
 		
+		if (me.isChampion() && Config.CHAMPION_PASSIVE)
+		{
+			return false;
+		}
+		
 		return target.isAutoAttackable(me) && GeoEngine.getInstance().canSeeTarget(me, target);
 	}