From: Mario <zacjardine@y7mail.com>
Date: Sun, 13 May 2018 02:18:09 +0000 (+0000)
Subject: Merge branch 'contributing' into 'master'
X-Git-Tag: xonotic-v0.8.5~2143
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ff4bde90ba27c5d50275989aec78f9e2a38b93d0;hp=cdb82646f16bccb6151f26e0da611d71d894786b

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 06bdb1428..2fcd30163 100644
--- 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
 	}