Prevent pathfinding checks for friendly NPCs.

This commit is contained in:
MobiusDev 2018-07-09 08:59:20 +00:00
parent 77e16cec9b
commit cc6b68f432
8 changed files with 16 additions and 8 deletions

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -73,6 +73,7 @@ import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.actor.stat.CharStat;
import com.l2jmobius.gameserver.model.actor.status.CharStatus;
@ -4289,7 +4290,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof L2QuestGuardInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{

View File

@ -81,6 +81,7 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.TeleportWhereType;
import com.l2jmobius.gameserver.model.TimeStamp;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
@ -3268,7 +3269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
// Movement checks.
if (Config.PATHFINDING)
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
{
if (isOnGeodataPath())
{