Addition of autoplay isMageCaster method.

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,7 +74,7 @@ public class AutoPlayTaskManager
 					else if (monster.getTarget() == player)
 					{
 						// We take granted that mage classes do not auto hit.
-						if (player.isMageClass())
+						if (isMageCaster(player))
 						{
 							continue PLAY;
 						}
@@ -154,7 +155,7 @@ public class AutoPlayTaskManager
 					player.setTarget(monster);
 					
 					// We take granted that mage classes do not auto hit.
-					if (player.isMageClass())
+					if (isMageCaster(player))
 					{
 						continue PLAY;
 					}
@@ -181,6 +182,11 @@ public class AutoPlayTaskManager
 		PLAYERS.remove(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoPlayTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java

@@ -24,6 +24,7 @@ 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;
@@ -204,7 +205,7 @@ public class AutoUseTaskManager
 								player.doCast(skill);
 								player.setTarget(savedTarget);
 							}
-							else if (player.isMageClass())
+							else if (isMageCaster(player))
 							{
 								player.useMagic(skill, null, true, false);
 							}
@@ -321,6 +322,11 @@ public class AutoUseTaskManager
 		stopAutoUseTask(player);
 	}
 	
+	private boolean isMageCaster(PlayerInstance player)
+	{
+		return player.isMageClass() && (player.getRace() != Race.ORC);
+	}
+	
 	public static AutoUseTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;