|
@@ -20,7 +20,6 @@ package com.l2jserver.gameserver.model.actor;
|
|
|
|
|
|
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
|
|
|
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
|
|
|
-import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
@@ -4377,15 +4376,17 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|
|
distance = Math.sqrt((dx * dx) + (dy * dy));
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
double cos;
|
|
|
double sin;
|
|
@@ -4451,8 +4452,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|
|
|
|
|
|
|
|
|
|
|
- if (((Config.PATHFINDING > 0) && (!(isAttackable() && ((L2Attackable) this).isReturningToSpawnPoint()))) || (isPlayer() && !(isInVehicle && (distance > 1500))) || (isSummon() && !(getAI().getIntention() == AI_INTENTION_FOLLOW))
|
|
|
- || isAfraid() || (this instanceof L2RiftInvaderInstance))
|
|
|
+ if (((Config.PATHFINDING > 0) && (!(isAttackable() && ((L2Attackable) this).isReturningToSpawnPoint())))
|
|
|
+ || (isPlayer() && !(isInVehicle && (distance > 1500)))
|
|
|
+ || (this instanceof L2RiftInvaderInstance))
|
|
|
{
|
|
|
if (isOnGeodataPath())
|
|
|
{
|
|
@@ -4502,7 +4504,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|
|
|
|
|
|
|
|
|
|
|
- if ((Config.PATHFINDING > 0) && ((originalDistance - distance) > 30) && (distance < 2000) && !isAfraid())
|
|
|
+ if ((Config.PATHFINDING > 0) && ((originalDistance - distance) > 30) && (distance < 2000))
|
|
|
{
|
|
|
|
|
|
|
|
@@ -4511,14 +4513,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|
|
m.geoPath = PathFinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId(), isPlayable());
|
|
|
if ((m.geoPath == null) || (m.geoPath.size() < 2))
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
if (isPlayer() || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((L2Summon) this).getFollowStatus()))
|
|
|
{
|
|
|
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|