diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 86fea92270..317796d2a1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -57,6 +57,11 @@ public class AutoPlayTaskManager
 					continue PLAY;
 				}
 				
+				if (player.isCastingNow() || (player.getQueuedSkill() != null))
+				{
+					continue PLAY;
+				}
+				
 				// Skip thinking.
 				final WorldObject target = player.getTarget();
 				if ((target != null) && target.isMonster())
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 86fea92270..317796d2a1 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -57,6 +57,11 @@ public class AutoPlayTaskManager
 					continue PLAY;
 				}
 				
+				if (player.isCastingNow() || (player.getQueuedSkill() != null))
+				{
+					continue PLAY;
+				}
+				
 				// Skip thinking.
 				final WorldObject target = player.getTarget();
 				if ((target != null) && target.isMonster())
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 86fea92270..317796d2a1 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
@@ -57,6 +57,11 @@ public class AutoPlayTaskManager
 					continue PLAY;
 				}
 				
+				if (player.isCastingNow() || (player.getQueuedSkill() != null))
+				{
+					continue PLAY;
+				}
+				
 				// Skip thinking.
 				final WorldObject target = player.getTarget();
 				if ((target != null) && target.isMonster())
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 86fea92270..317796d2a1 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -57,6 +57,11 @@ public class AutoPlayTaskManager
 					continue PLAY;
 				}
 				
+				if (player.isCastingNow() || (player.getQueuedSkill() != null))
+				{
+					continue PLAY;
+				}
+				
 				// Skip thinking.
 				final WorldObject target = player.getTarget();
 				if ((target != null) && target.isMonster())