From a81169820a1598eda71bb55af2aa214aae0c4ac2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 14 Jun 2021 21:45:27 +0000
Subject: [PATCH] Dropped isMageCaster method from AutoUseTaskManager.

---
 .../taskmanager/AutoUseTaskManager.java       | 22 +------------------
 .../taskmanager/AutoUseTaskManager.java       | 22 +------------------
 .../taskmanager/AutoUseTaskManager.java       | 22 +------------------
 .../taskmanager/AutoUseTaskManager.java       | 15 +------------
 .../taskmanager/AutoUseTaskManager.java       | 14 +-----------
 .../taskmanager/AutoUseTaskManager.java       | 14 +-----------
 6 files changed, 6 insertions(+), 103 deletions(-)

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 3e8069fd7b..4462e06be2 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
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ActionData;
-import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -256,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -373,18 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		// Iss classes considered fighters.
-		final int classId = player.getActiveClass();
-		if ((classId > 170) && (classId < 176))
-		{
-			return false;
-		}
-		
-		return player.isMageClass() && (player.getRace() != Race.ORC);
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
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 3e8069fd7b..4462e06be2 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
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ActionData;
-import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -256,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -373,18 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		// Iss classes considered fighters.
-		final int classId = player.getActiveClass();
-		if ((classId > 170) && (classId < 176))
-		{
-			return false;
-		}
-		
-		return player.isMageClass() && (player.getRace() != Race.ORC);
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
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 3e8069fd7b..4462e06be2 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
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ActionData;
-import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -256,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -373,18 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		// Iss classes considered fighters.
-		final int classId = player.getActiveClass();
-		if ((classId > 170) && (classId < 176))
-		{
-			return false;
-		}
-		
-		return player.isMageClass() && (player.getRace() != Race.ORC);
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
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 eec01dd74b..4462e06be2 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
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.data.xml.ActionData;
-import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
@@ -256,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -373,11 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		return player.isMageClass() && (player.getRace() != Race.ORC);
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
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 f15ad658ab..4462e06be2 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
@@ -255,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -372,11 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		return player.isMageClass() /* && (player.getRace() != Race.ORC) - On Essence orc mages have caster skills. */;
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
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 f15ad658ab..4462e06be2 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
@@ -255,14 +255,7 @@ public class AutoUseTaskManager
 						
 						if (!player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, target, false))
 						{
-							if (isMageCaster(player))
-							{
-								player.useMagic(skill, null, true, false);
-							}
-							else
-							{
-								player.doCast(skill);
-							}
+							player.useMagic(skill, null, true, false);
 						}
 					}
 					
@@ -372,11 +365,6 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
-	private boolean isMageCaster(PlayerInstance player)
-	{
-		return player.isMageClass() /* && (player.getRace() != Race.ORC) - On Essence orc mages have caster skills. */;
-	}
-	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;