Index: server/unittools.c
===================================================================
RCS file: /home/freeciv/cvsroot/freeciv/server/unittools.c,v
retrieving revision 1.178
diff -r1.178 unittools.c
2360c2360,2361
<   if (city_exists_within_city_radius(punit->x, punit->y, TRUE)) {
---
>   if (city_exists_within_city_radius(punit->x, punit->y, TRUE) ||
>      (game.barbarianrate == 0) || (game.year < game.onsetbarbarian)) {