Removed redundant movement checks.
Contributed by Trance.
This commit is contained in:
parent
97227fb27a
commit
08841c8e3c
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3397,10 +3397,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3397,10 +3397,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3397,10 +3397,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -5530,10 +5530,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -5576,10 +5576,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -4339,10 +4339,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -4341,10 +4341,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3411,10 +3411,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3411,10 +3411,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3410,10 +3410,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3398,10 +3398,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3413,10 +3413,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
@ -3420,10 +3420,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user