BETA: Cleanup of [6248].

		* Reported by: xban1x

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -350,25 +350,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				{
 					if (npc.getSpawn() != null)
 					{
-						int x, y, z;
-						
-						// Territory based spawn
-						if ((npc.getSpawn().getX() == 0) && (npc.getSpawn().getY() == 0))
-						{
-							x = npc.getSpawn().getX(npc);
-							y = npc.getSpawn().getY(npc);
-							z = npc.getSpawn().getZ(npc);
-						}
-						// Npc with fixed coords
-						else
-						{
-							x = npc.getSpawn().getX();
-							y = npc.getSpawn().getY();
-							z = npc.getSpawn().getZ();
-						}
-						
+						final Location loc = npc.getSpawn().getLocation(npc);
 						final int range = Config.MAX_DRIFT_RANGE;
-						if (!npc.isInsideRadius(x, y, z, range + range, true, false))
+						
+						if (!npc.isInsideRadius(loc, range + range, true, false))
 						{
 							intention = AI_INTENTION_ACTIVE;
 						}
@@ -687,20 +672,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 			else
 			{
-				// New territory based spawn - obtain last spawn point
-				if ((npc.getSpawn().getX() == 0) && (npc.getSpawn().getY() == 0))
-				{
-					x1 = npc.getSpawn().getX(npc);
-					y1 = npc.getSpawn().getY(npc);
-					z1 = npc.getSpawn().getZ(npc);
-				}
-				else
-				// If NPC with fixed coord
-				{
-					x1 = npc.getSpawn().getX();
-					y1 = npc.getSpawn().getY();
-					z1 = npc.getSpawn().getZ();
-				}
+				x1 = npc.getSpawn().getX(npc);
+				y1 = npc.getSpawn().getY(npc);
+				z1 = npc.getSpawn().getZ(npc);
 				
 				if (!npc.isInsideRadius(x1, y1, 0, range, false, false))
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Object.java

@@ -740,7 +740,7 @@ public abstract class L2Object implements IIdentifiable, INamable, ISpawnable, I
 	 */
 	public double calculateDistance(ILocational loc, boolean includeZAxis, boolean squared)
 	{
-		return calculateDistance(loc.getLocation(this).getX(), loc.getLocation(this).getY(), loc.getLocation(this).getZ(), includeZAxis, squared);
+		return calculateDistance(loc.getX(), loc.getY(), loc.getZ(), includeZAxis, squared);
 	}
 	
 	@Override
@@ -779,12 +779,6 @@ public abstract class L2Object implements IIdentifiable, INamable, ISpawnable, I
 		return new Location(getX(), getY(), getZ(), getHeading(), getInstanceId());
 	}
 	
-	@Override
-	public Location getLocation(L2Object obj)
-	{
-		return getLocation();
-	}
-	
 	@Override
 	public void setX(int x)
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Spawn.java

@@ -169,7 +169,6 @@ public class L2Spawn implements IPositionable, IIdentifiable
 		return _location;
 	}
 	
-	@Override
 	public Location getLocation(L2Object obj)
 	{
 		return ((_lastSpawnPoints == null) || (obj == null) || !_lastSpawnPoints.containsKey(obj.getObjectId())) ? _location : _lastSpawnPoints.get(obj.getObjectId());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Location.java

@@ -18,7 +18,6 @@
  */
 package com.l2jserver.gameserver.model;
 
-import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
 
 /**
@@ -178,13 +177,6 @@ public class Location implements IPositionable
 		return this;
 	}
 	
-	@Override
-	public IPositionable getLocation(L2Object obj)
-	{
-		return this;
-	}
-
-
 	@Override
 	public void setLocation(Location loc)
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/ILocational.java

@@ -18,8 +18,6 @@
  */
 package com.l2jserver.gameserver.model.interfaces;
 
-import com.l2jserver.gameserver.model.L2Object;
-
 /**
  * Simple interface for location of object.
  * @author xban1x
@@ -37,5 +35,4 @@ public interface ILocational
 	public int getInstanceId();
 	
 	public ILocational getLocation();
-	public ILocational getLocation(L2Object obj);
 }