diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 4ba5caab72..4bf8cefd19 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 4ba5caab72..4bf8cefd19 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 4ba5caab72..4bf8cefd19 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 4ba5caab72..4bf8cefd19 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 4ba5caab72..4bf8cefd19 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 70346af0ea..2de316c1b6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 70346af0ea..2de316c1b6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -101,6 +101,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 5f490b7902..af0aaf2a49 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -102,6 +102,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 2291c9a49e..dcc9279493 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -102,6 +102,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 2291c9a49e..dcc9279493 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -102,6 +102,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 2291c9a49e..dcc9279493 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -102,6 +102,13 @@ public class AutoPlayTaskManager
 							{
 								if (creature.isAutoAttackable(player))
 								{
+									// GeoEngine can see target check.
+									if (!GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										player.setTarget(null);
+										continue PLAY;
+									}
+									
 									player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
 								}
 							}