Merge branch 'master' into pending-release

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index c7c939d74d6e4f3c553f958b611f8008aec2c1a3..9b4455fcfd0c5cbb42605d1e1edf5a7c981f1949 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -160,7 +160,7 @@ int Team_GetNumberOfTeamsWithOwnedItems()
 
 void setcolor(entity this, int clr)
 {
-#if 0
+#if 1
        this.clientcolors = clr;
        this.team = (clr & 15) + 1;
 #else