--- unit-old.c	Fri May 25 13:37:21 2001
+++ unit.c	Thu Jun  7 18:58:42 2001
@@ -99,6 +99,9 @@
   struct city *pcity=map_get_city(destx, desty);
   int playerid = pdiplomat->owner;
 
+  if (action!=DIPLOMAT_MOVE && map_get_terrain(pdiplomat->x, pdiplomat->y)==T_OCEAN)
+     return 0;
+  
   if(pcity) {  
     if(pcity->owner!=pdiplomat->owner &&
        real_map_distance(pdiplomat->x, pdiplomat->y, pcity->x, pcity->y) <= 1) {