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

Prohibit mages from auto attacking.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-12-23 23:10:12 +00:00
parent 3ef253b7e5
commit 51fc0ff26f
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@ -22,7 +22,6 @@ 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,6 +72,12 @@ public class AutoPlayTaskManager
}
else if (monster.getTarget() == player)
{
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}
// Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
{
@ -148,8 +153,8 @@ public class AutoPlayTaskManager
{
player.setTarget(monster);
// We take granted that non Orc mage classes do not auto hit when mana is over 5%.
if (player.isMageClass() && (player.getRace() != Race.ORC) && (player.getCurrentMpPercent() > 5))
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}

11
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@ -22,7 +22,6 @@ 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,6 +72,12 @@ public class AutoPlayTaskManager
}
else if (monster.getTarget() == player)
{
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}
// Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
{
@ -148,8 +153,8 @@ public class AutoPlayTaskManager
{
player.setTarget(monster);
// We take granted that non Orc mage classes do not auto hit when mana is over 5%.
if (player.isMageClass() && (player.getRace() != Race.ORC) && (player.getCurrentMpPercent() > 5))
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@ -22,7 +22,6 @@ 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,6 +72,12 @@ public class AutoPlayTaskManager
}
else if (monster.getTarget() == player)
{
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}
// Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
{
@ -148,8 +153,8 @@ public class AutoPlayTaskManager
{
player.setTarget(monster);
// We take granted that non Orc mage classes do not auto hit when mana is over 5%.
if (player.isMageClass() && (player.getRace() != Race.ORC) && (player.getCurrentMpPercent() > 5))
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}

11
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@ -22,7 +22,6 @@ 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,6 +72,12 @@ public class AutoPlayTaskManager
}
else if (monster.getTarget() == player)
{
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}
// Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow() && !player.isMoving())
{
@ -148,8 +153,8 @@ public class AutoPlayTaskManager
{
player.setTarget(monster);
// We take granted that non Orc mage classes do not auto hit when mana is over 5%.
if (player.isMageClass() && (player.getRace() != Race.ORC) && (player.getCurrentMpPercent() > 5))
// We take granted that mage classes do not auto hit.
if (player.isMageClass())
{
continue PLAY;
}