Merge branch 'master' into z411/team_queue

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qc

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index f93880a682d45d6b50c7983c18778b9968ebc1f4..6734ce919193de1286cdf1e2f671f1cfd1f99343 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -694,7 +694,7 @@ void ClientCommand_spectate(entity caller, int request)
 
                                if (mutator_returnvalue == MUT_SPECCMD_RETURN) return;
 
-                               if ((IS_PLAYER(caller) || mutator_returnvalue == MUT_SPECCMD_FORCE))
+                               if ((IS_PLAYER(caller) || mutator_returnvalue == MUT_SPECCMD_FORCE || caller.wants_join))
                                if (autocvar_sv_spectate == 1)
                                        ClientKill_TeamChange(caller, -2); // observe
                        }