X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fscores.qc;fp=qcsrc%2Fserver%2Fscores.qc;h=ad10fa5d53accf9baa0e4791a96215acc0bf691c;hp=3d8460bcb7eb27060954a69353f3c328af33368b;hb=94a967120c8bfe0d4ffd95690b97e5af297dfc05;hpb=3b8ace6c8441fe98d468b9fcfab94c05f09ae3c2

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 3d8460bcb7..ad10fa5d53 100644
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -256,8 +256,8 @@ float PlayerScore_Clear(entity player)
 	if(teamscores_entities_count)
 		return 0;
 
-	if(MUTATOR_CALLHOOK(PlayerClearScore)) return 0;
-	if(g_arena || g_ca) return 0;
+	if(MUTATOR_CALLHOOK(ForbidPlayerScore_Clear)) return 0;
+
 	if(g_cts) return 0; // in CTS, you don't lose score by observing
 	if(g_race && g_race_qualifying) return 0; // in qualifying, you don't lose score by observing
 
@@ -527,12 +527,12 @@ void WinningConditionHelper()
 				s = strcat(s, ":human");
 			else
 				s = strcat(s, ":bot");
-			if(p.classname != "player" && !g_arena && !g_ca && !g_lms)
+			if(p.classname != "player" && !g_arena && p.caplayer != 1 && !g_lms)
 				s = strcat(s, ":spectator");
 		}
 		else
 		{
-			if(p.classname == "player" || g_arena || g_ca || g_lms)
+			if(p.classname == "player" || g_arena || p.caplayer == 1 || g_lms)
 				s = GetPlayerScoreString(p, 2);
 			else
 				s = "-666";