Prevent generating some variables when pathfinding is disabled.
This commit is contained in:
parent
5cfe45f7c8
commit
92f4cf4ef8
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -6435,16 +6435,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING > 0)
|
if (Config.PATHFINDING > 0)
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -4232,16 +4232,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof L2QuestGuardInstance))
|
if (Config.PATHFINDING && !(this instanceof L2QuestGuardInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
m.disregardingGeodata = true;
|
m.disregardingGeodata = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
final double originalDistance = distance;
|
|
||||||
final int originalX = x;
|
|
||||||
final int originalY = y;
|
|
||||||
final int originalZ = z;
|
|
||||||
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
|
||||||
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
|
||||||
|
|
||||||
// Movement checks.
|
// Movement checks.
|
||||||
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
|
||||||
{
|
{
|
||||||
|
final double originalDistance = distance;
|
||||||
|
final int originalX = x;
|
||||||
|
final int originalY = y;
|
||||||
|
final int originalZ = z;
|
||||||
|
final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
|
||||||
|
final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
|
||||||
|
|
||||||
if (isOnGeodataPath())
|
if (isOnGeodataPath())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
Loading…
Reference in New Issue
Block a user