lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dropped isMageCaster method from AutoUseTaskManager.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-06-14 21:45:27 +00:00
parent 18ebd4f620
commit a81169820a
6 changed files with 6 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;

22
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;

22
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;

14
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;

14
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -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;