Index: server/gotohand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/gotohand.c,v
retrieving revision 1.143
diff -u -r1.143 gotohand.c
--- server/gotohand.c	2002/03/13 11:49:20	1.143
+++ server/gotohand.c	2002/05/27 15:42:27
@@ -774,19 +774,12 @@
 	/* Planes could run out of fuel, therefore we don't care if territory
 	   is unknown. Also, don't attack except at the destination. */
 
-	/* This should probably use airspace_looks_safe instead. */
-	if (is_non_allied_unit_tile(pdesttile, unit_owner(punit))) {
-	  if (x1 != dest_x || y1 != dest_y) {
-	    continue;
-	  }
-	} else {
-	  struct city *pcity =
-	      is_non_allied_city_tile(pdesttile, unit_owner(punit));
-	  if (pcity
-	      && (pplayers_non_attack(unit_owner(punit), city_owner(pcity))
-		  || !is_heli_unit(punit)))
-	    continue;
-	}
+        if (x1 != dest_x && y1 != dest_y) {
+          /* If it's not our destination, we check if it's safe */
+          if (!airspace_looks_safe(x1, y1, pplayer)) {
+            continue;
+          }
+        }
 
 	if ((restriction == GOTO_MOVE_STRAIGHTEST) && (dir == straight_dir))
 	  move_cost /= SINGLE_MOVE;