Merge branch 'contributing' into 'master'

Fix bug with PM (tell command) between spectators

See merge request xonotic/xonotic-data.pk3dir!557

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 06bdb1428f869439244afd76f9e836eef8000945..2fcd3016395bf1492bfe209242392909a1a816c8 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -969,7 +969,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
        if (privatesay && source && !IS_PLAYER(source))
        {
                if (!game_stopped)
-               if ((privatesay && !IS_PLAYER(privatesay)) || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !warmup_stage))
+               if ((privatesay && IS_PLAYER(privatesay)) && ((autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !warmup_stage)))
                        ret = -1; // just hide the message completely
        }