From: Mario <mario.mario@y7mail.com>
Date: Thu, 2 Jan 2025 01:37:20 +0000 (+0000)
Subject: Fix monsters preferring player colours over team colours
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7de9a09ff4241a1f5521c506b08e2e556cd4f42;p=xonotic%2Fxonotic-data.pk3dir.git

Fix monsters preferring player colours over team colours
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index b71e1054d..6f3191196 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -164,10 +164,10 @@ entity Monster_FindTarget(entity this)
 
 void monster_setupcolors(entity this)
 {
-	if(IS_PLAYER(this.realowner))
-		this.colormap = this.realowner.colormap;
-	else if(teamplay && this.team)
+	if(teamplay && this.team)
 		this.colormap = 1024 + (this.team - 1) * 17;
+	else if(IS_PLAYER(this.realowner))
+		this.colormap = this.realowner.colormap;
 	else
 	{
 		if(this.monster_skill <= MONSTER_SKILL_EASY)