L2AttackableAI.java

+import com.l2jfrozen.gameserver.geo.GeoEngine;
 import com.l2jfrozen.gameserver.managers.DimensionalRiftManager;
 import com.l2jfrozen.gameserver.model.L2Attackable;
 import com.l2jfrozen.gameserver.model.L2Character;
@@ -900,16 +901,14 @@

 			// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
 			if (hated.isMoving())
-			{
-				range -= 100;
+			{
+				range -= 30;
 			}
-			if (range < 5)
-			{
-				range = 5;
-			}

-			moveToPawn(originalAttackTarget, range);
-
+			if (!GeoEngine.getInstance().canMoveFromToTarget(_actor.getX(), _actor.getY(), _actor.getZ(), originalAttackTarget.getX(), originalAttackTarget.getY(), originalAttackTarget.getZ()))
+				moveTo(originalAttackTarget.getX(), originalAttackTarget.getY(), originalAttackTarget.getZ());
+			else
+				moveToPawn(originalAttackTarget, Math.max(range, 5));
 			return;