From 7c854028705de87648307e116d5f19009f0a5542 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:33:33 +0000
Subject: [PATCH] Stop attack actions when auto play is not enabled.

---
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 .../gameserver/taskmanager/AutoPlayTaskManager.java         | 5 +++++
 .../gameserver/taskmanager/AutoUseTaskManager.java          | 6 ++++++
 16 files changed, 88 insertions(+)

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 19b6d443be..057a9ce9e2 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
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		// Iss classes considered fighters.
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 4462e06be2..70019cb4a8 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
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
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 19b6d443be..057a9ce9e2 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
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		// Iss classes considered fighters.
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 4462e06be2..70019cb4a8 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
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 19b6d443be..057a9ce9e2 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		// Iss classes considered fighters.
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 4462e06be2..70019cb4a8 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 19b6d443be..057a9ce9e2 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		// Iss classes considered fighters.
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 4462e06be2..70019cb4a8 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
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 616984f1c6..89c334b348 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
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		return player.isMageClass() && (player.getRace() != Race.ORC);
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 4462e06be2..70019cb4a8 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
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
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 616984f1c6..89c334b348 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
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		return player.isMageClass() && (player.getRace() != Race.ORC);
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 4462e06be2..70019cb4a8 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
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 616984f1c6..89c334b348 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		return player.isMageClass() && (player.getRace() != Race.ORC);
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 4462e06be2..70019cb4a8 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());
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 616984f1c6..89c334b348 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
@@ -182,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	public boolean isAutoPlay(PlayerInstance player)
+	{
+		return PLAYERS.contains(player);
+	}
+	
 	private boolean isMageCaster(PlayerInstance player)
 	{
 		return player.isMageClass() && (player.getRace() != Race.ORC);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 4462e06be2..70019cb4a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -219,6 +219,12 @@ public class AutoUseTaskManager
 						}
 					}
 					
+					// Continue when auto play is not enabled.
+					if (!AutoPlayTaskManager.getInstance().isAutoPlay(player))
+					{
+						continue;
+					}
+					
 					SKILLS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
 					{
 						final Skill skill = player.getKnownSkill(skillId.intValue());