From 77678ad7465313895eba58d9a437f66edef95ee2 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 5 May 2021 18:08:24 +0000 Subject: [PATCH] Addition of autoplay isMageCaster method. --- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- .../gameserver/taskmanager/AutoPlayTaskManager.java | 10 ++++++++-- .../gameserver/taskmanager/AutoUseTaskManager.java | 8 +++++++- 12 files changed, 90 insertions(+), 18 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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,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; 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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,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; 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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,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; 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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,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; 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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 @@ -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; 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 188c435e27..616984f1c6 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 @@ -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; 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 a02c7a4a0a..84bfba16ef 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 @@ -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;