diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/server/srv_main.c barbciv/server/srv_main.c
--- freeciv/server/srv_main.c	Thu Dec 21 13:20:13 2000
+++ barbciv/server/srv_main.c	Thu Dec 21 13:20:25 2000
@@ -1380,8 +1380,6 @@
   }
 
   game.nplayers++;
-  if(server_state==PRE_GAME_STATE && game.max_players==game.nplayers)
-    server_state=SELECT_RACES_STATE;
 
   introduce_game_to_connection(pconn);
   send_server_info_to_metaserver(1,0);
@@ -1627,7 +1625,7 @@
     return;
   }
 
-  if(game.nplayers==game.max_players) {
+  if(game.nplayers >= game.max_players) {
     reject_new_player(_("Sorry, the game is full."), pconn);
     freelog(LOG_NORMAL, _("%s was rejected: Maximum number of players reached."),
 	    pconn->name);    
diff -Nur -X/data/freeciv-dev/freeciv/diff_ignore freeciv/server/stdinhand.c barbciv/server/stdinhand.c
--- freeciv/server/stdinhand.c	Thu Dec 21 13:20:13 2000
+++ barbciv/server/stdinhand.c	Thu Dec 21 13:20:25 2000
@@ -1595,7 +1595,7 @@
     return;
   }
 
-  if (game.nplayers==game.max_players) 
+  if (game.nplayers >= game.max_players) 
   {
     cmd_reply(CMD_CREATE, caller, C_FAIL,
 	      _("Can't add more players, server is full."));