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

Auto play manager improvements.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-29 18:04:31 +00:00
parent 5a26950843
commit 57524ce5ea
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -60,7 +61,11 @@ public class AutoPlayTaskManager
if ((target != null) && target.isMonster()) if ((target != null) && target.isMonster())
{ {
final MonsterInstance monster = (MonsterInstance) target; final MonsterInstance monster = (MonsterInstance) target;
if ((monster.getTarget() == player) && !monster.isAlikeDead()) if (monster.isAlikeDead())
{
player.setTarget(null);
}
else if (monster.getTarget() == player)
{ {
// Check if actually attacking. // Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow()) if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
@@ -87,7 +92,7 @@ public class AutoPlayTaskManager
// Move to item. // Move to item.
if (player.calculateDistance2D(droppedItem) > 50) if (player.calculateDistance2D(droppedItem) > 50)
{ {
player.moveToLocation(droppedItem.getX(), droppedItem.getY(), droppedItem.getZ(), 0); player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, droppedItem);
continue PLAY; continue PLAY;
} }

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

@@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -60,7 +61,11 @@ public class AutoPlayTaskManager
if ((target != null) && target.isMonster()) if ((target != null) && target.isMonster())
{ {
final MonsterInstance monster = (MonsterInstance) target; final MonsterInstance monster = (MonsterInstance) target;
if ((monster.getTarget() == player) && !monster.isAlikeDead()) if (monster.isAlikeDead())
{
player.setTarget(null);
}
else if (monster.getTarget() == player)
{ {
// Check if actually attacking. // Check if actually attacking.
if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow()) if (player.hasAI() && player.getAI().isAutoAttacking() && !player.isAttackingNow() && !player.isCastingNow())
@@ -87,7 +92,7 @@ public class AutoPlayTaskManager
// Move to item. // Move to item.
if (player.calculateDistance2D(droppedItem) > 50) if (player.calculateDistance2D(droppedItem) > 50)
{ {
player.moveToLocation(droppedItem.getX(), droppedItem.getY(), droppedItem.getZ(), 0); player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, droppedItem);
continue PLAY; continue PLAY;
} }