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

Fixed stackoverflow errors from movement.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2020-06-16 16:08:26 +00:00
parent 67fffe36d7
commit 8bdf70c0e1
38 changed files with 174 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

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

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

10
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -694,11 +694,10 @@ abstract class AbstractAI implements Ctrl
{
if (_clientMoving)
{
final Creature follow = getFollowTarget();
if ((_clientMovingToPawnOffset != 0) && (follow != null))
if ((_clientMovingToPawnOffset != 0) && isFollowing())
{
// Send a Server->Client packet MoveToPawn to the actor and all PlayerInstance in its _knownPlayers
player.sendPacket(new MoveToPawn(_actor, follow, _clientMovingToPawnOffset));
player.sendPacket(new MoveToPawn(_actor, _followTarget, _clientMovingToPawnOffset));
}
else
{
@ -708,6 +707,11 @@ abstract class AbstractAI implements Ctrl
}
}
public boolean isFollowing()
{
return (_followTarget != null) && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**
* Create and Launch an AI Follow Task to execute every 1s.
* @param target The Creature to follow

9
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -694,11 +694,10 @@ abstract class AbstractAI implements Ctrl
{
if (_clientMoving)
{
final Creature follow = getFollowTarget();
if ((_clientMovingToPawnOffset != 0) && (follow != null))
if ((_clientMovingToPawnOffset != 0) && isFollowing())
{
// Send a Server->Client packet MoveToPawn to the actor and all PlayerInstance in its _knownPlayers
player.sendPacket(new MoveToPawn(_actor, follow, _clientMovingToPawnOffset));
player.sendPacket(new MoveToPawn(_actor, _followTarget, _clientMovingToPawnOffset));
}
else
{
@ -708,6 +707,11 @@ abstract class AbstractAI implements Ctrl
}
}
public boolean isFollowing()
{
return (_followTarget != null) && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**
* Create and Launch an AI Follow Task to execute every 1s.
* @param target The Creature to follow

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

7
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -744,7 +744,7 @@ public abstract class AbstractAI implements Ctrl
{
if (_actor.isVisibleFor(player) && _clientMoving)
{
if ((_clientMovingToPawnOffset != 0) && (_followTarget != null))
if ((_clientMovingToPawnOffset != 0) && isFollowing())
{
// Send a Server->Client packet MoveToPawn to the actor and all PlayerInstance in its _knownPlayers
player.sendPacket(new MoveToPawn(_actor, _followTarget, _clientMovingToPawnOffset));
@ -757,6 +757,11 @@ public abstract class AbstractAI implements Ctrl
}
}
public boolean isFollowing()
{
return (_followTarget != null) && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**
* Create and Launch an AI Follow Task to execute every 1s.
* @param target The Creature to follow

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -744,7 +744,7 @@ public abstract class AbstractAI implements Ctrl
{
if (_actor.isVisibleFor(player) && _clientMoving)
{
if ((_clientMovingToPawnOffset != 0) && (_followTarget != null))
if ((_clientMovingToPawnOffset != 0) && isFollowing())
{
// Send a Server->Client packet MoveToPawn to the actor and all PlayerInstance in its _knownPlayers
player.sendPacket(new MoveToPawn(_actor, _followTarget, _clientMovingToPawnOffset));
@ -757,6 +757,11 @@ public abstract class AbstractAI implements Ctrl
}
}
public boolean isFollowing()
{
return (_followTarget != null) && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**
* Create and Launch an AI Follow Task to execute every 1s.
* @param target The Creature to follow

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

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

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -692,7 +692,7 @@ public abstract class AbstractAI implements Ctrl
public boolean isFollowing()
{
return (_target != null) && _target.isCreature() && (_intention == AI_INTENTION_FOLLOW);
return (_target != null) && _target.isCreature() && ((_intention == AI_INTENTION_FOLLOW) || CreatureFollowTaskManager.getInstance().isFollowing(_actor));
}
/**

9
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@ -126,16 +126,21 @@ public class CreatureFollowTaskManager
}
}
public boolean isFollowing(Creature creature)
{
return NORMAL_FOLLOW_CREATURES.containsKey(creature) || ATTACK_FOLLOW_CREATURES.containsKey(creature);
}
public void addNormalFollow(Creature creature, int range)
{
follow(creature, range);
NORMAL_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void addAttackFollow(Creature creature, int range)
{
follow(creature, range);
ATTACK_FOLLOW_CREATURES.putIfAbsent(creature, range);
follow(creature, range);
}
public void remove(Creature creature)