[Freeciv-Dev] Re: (PR#14152) Observer snafu on pubserver

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14152 >

The bug is rather obvious.

 > team observer team1
Player Observer set to team team1.

This will be fixed by the observer patch for 2.1, but it should be fixed 
for 2.0.7.

-jason

? data/amplio
? data/amplio.tilespec
Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.354.2.43
diff -p -u -r1.354.2.43 stdinhand.c
--- server/stdinhand.c  26 Sep 2005 15:58:53 -0000      1.354.2.43
+++ server/stdinhand.c  2 Oct 2005 16:39:56 -0000
@@ -2115,6 +2115,11 @@ static bool team_command(struct connecti
     cmd_reply(CMD_TEAM, caller, C_SYNTAX, _("Cannot team a barbarian."));
     goto cleanup;
   }
+  if (pplayer->is_observer) {
+    /* Not allowed! */
+    cmd_reply(CMD_TEAM, caller, C_SYNTAX, _("Cannot team an observer."));
+    goto cleanup;
+  }
   if (!check) {
     team_add_player(pplayer, arg[1]);
     cmd_reply(CMD_TEAM, caller, C_OK, _("Player %s set to team %s."),