From 46fe32d9beb8e540a7f96634ceb530fa30e026c0 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 22 Nov 2020 23:02:05 +0000
Subject: [PATCH] Prevent auto attacking while moving.

---
 .../l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java   | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java   | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java   | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java   | 2 +-
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

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 53c337ad65..c8ea29f442 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
@@ -68,7 +68,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// Check if actually attacking.
-						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
+						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
 						{
 							player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, monster);
 						}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0da8a3d46c..58c7c58ab0 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -130,7 +130,7 @@ public class AutoUseTaskManager
 					}
 				}
 				
-				if (Config.ENABLE_AUTO_BUFF)
+				if (Config.ENABLE_AUTO_BUFF && !player.isMoving())
 				{
 					BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
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 53c337ad65..c8ea29f442 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
@@ -68,7 +68,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// Check if actually attacking.
-						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
+						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
 						{
 							player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, monster);
 						}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0da8a3d46c..58c7c58ab0 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -130,7 +130,7 @@ public class AutoUseTaskManager
 					}
 				}
 				
-				if (Config.ENABLE_AUTO_BUFF)
+				if (Config.ENABLE_AUTO_BUFF && !player.isMoving())
 				{
 					BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
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 53c337ad65..c8ea29f442 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
@@ -68,7 +68,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// Check if actually attacking.
-						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
+						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
 						{
 							player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, monster);
 						}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0da8a3d46c..58c7c58ab0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -130,7 +130,7 @@ public class AutoUseTaskManager
 					}
 				}
 				
-				if (Config.ENABLE_AUTO_BUFF)
+				if (Config.ENABLE_AUTO_BUFF && !player.isMoving())
 				{
 					BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
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 53c337ad65..c8ea29f442 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
@@ -68,7 +68,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// Check if actually attacking.
-						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
+						if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
 						{
 							player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, monster);
 						}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0da8a3d46c..58c7c58ab0 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -130,7 +130,7 @@ public class AutoUseTaskManager
 					}
 				}
 				
-				if (Config.ENABLE_AUTO_BUFF)
+				if (Config.ENABLE_AUTO_BUFF && !player.isMoving())
 				{
 					BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{