Merge branch 'master' into terencehill/hud_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / ent_cs.qh

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 1dec53be65e2434a33779b62d1190f5df0f621fa..65cdd83d3a71f4f5df325a8e90b727d936cb1300 100644 (file)
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -109,7 +109,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
        string entcs_GetName(int i)
        {
                entity e = entcs_receiver(i);
-               return e ? ColorTranslateRGB(e.netname) : ColorTranslateRGB(getplayerkeyvalue(i, "name"));
+               return ColorTranslateRGB(e ? e.netname : getplayerkeyvalue(i, "name"));
        }
 
     /**