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 b71e1054d6db5e7d49f94d13f58442635b1d1614..6f3191196be51c85f1095a0d7cae02f72a0943c3 100644 (file)
--- 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)