From d8cfd5d58bd05556b61a32609dab4131a16bdb63 Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Mon, 5 Apr 2021 17:14:59 +0200
Subject: [PATCH 1/2] fix nametag and blip color

---
 ReallifeGamemode.Server/Extensions/ClientExtension.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index c77d1f35..d6af798c 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -268,7 +268,11 @@ namespace ReallifeGamemode.Server.Extensions
       }
       else if (user.Faction != null)
       {
-        nameTagColor = user.FactionId.Value;
+        if(user.FactionId > 3 || (user.FactionId >= 1 && user.FactionId <= 3 && duty))
+        {
+          nameTagColor = user.FactionId.Value;
+        }
+        
         switch (user.FactionId)
         {
           case 1 when duty:

From 42e292d3cfbb789d13f050eedd7b770c0944838e Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Mon, 5 Apr 2021 17:21:25 +0200
Subject: [PATCH 2/2] fix nametag blip on login

---
 ReallifeGamemode.Server/Extensions/ClientExtension.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index d6af798c..fe5d37ea 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -266,7 +266,7 @@ namespace ReallifeGamemode.Server.Extensions
         nameTagColor = -1;
         blipColor = 64;
       }
-      else if (user.Faction != null)
+      else if (user.FactionId != null)
       {
         if(user.FactionId > 3 || (user.FactionId >= 1 && user.FactionId <= 3 && duty))
         {