From 1a8494c1b003aae9ee2016aaea0c87a6fc9d9f4c Mon Sep 17 00:00:00 2001
From: r00telement <47005506+r00telement@users.noreply.github.com>
Date: Wed, 22 Dec 2021 19:50:20 +0000
Subject: [PATCH] Prioritize custom tag name colors over job

---
 .../Features/NameplatesTagTargetFeature.cs    | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/PlayerTags/Features/NameplatesTagTargetFeature.cs b/PlayerTags/Features/NameplatesTagTargetFeature.cs
index 05d2931..e5c8f10 100644
--- a/PlayerTags/Features/NameplatesTagTargetFeature.cs
+++ b/PlayerTags/Features/NameplatesTagTargetFeature.cs
@@ -248,39 +248,6 @@ namespace PlayerTags.Features
             }
 
             // An additional step to apply text color to additional locations
-            if (gameObject is PlayerCharacter playerCharacter1)
-            {
-                if (m_PluginData.JobTags.TryGetValue(playerCharacter1.ClassJob.GameData.Abbreviation, out var jobTag))
-                {
-                    if (IsTagVisible(jobTag, gameObject))
-                    {
-                        if (jobTag.TextColor.InheritedValue != null)
-                        {
-                            if (jobTag.IsTextColorAppliedToNameplateName.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateName.InheritedValue.Value)
-                            {
-                                name.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
-                                name.Payloads.Add(new UIForegroundPayload(0));
-                                isNameChanged = true;
-                            }
-
-                            if (jobTag.IsTextColorAppliedToNameplateTitle.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateTitle.InheritedValue.Value)
-                            {
-                                title.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
-                                title.Payloads.Add(new UIForegroundPayload(0));
-                                isTitleChanged = true;
-                            }
-
-                            if (jobTag.IsTextColorAppliedToNameplateFreeCompany.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateFreeCompany.InheritedValue.Value)
-                            {
-                                freeCompany.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
-                                freeCompany.Payloads.Add(new UIForegroundPayload(0));
-                                isFreeCompanyChanged = true;
-                            }
-                        }
-                    }
-                }
-            }
-
             foreach (var customTag in m_PluginData.CustomTags)
             {
                 if (customTag.CanAddToIdentity(new Identity(gameObject.Name.TextValue)))
@@ -313,6 +280,39 @@ namespace PlayerTags.Features
                     }
                 }
             }
+
+            if (gameObject is PlayerCharacter playerCharacter1)
+            {
+                if (m_PluginData.JobTags.TryGetValue(playerCharacter1.ClassJob.GameData.Abbreviation, out var jobTag))
+                {
+                    if (IsTagVisible(jobTag, gameObject))
+                    {
+                        if (jobTag.TextColor.InheritedValue != null)
+                        {
+                            if (jobTag.IsTextColorAppliedToNameplateName.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateName.InheritedValue.Value)
+                            {
+                                name.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
+                                name.Payloads.Add(new UIForegroundPayload(0));
+                                isNameChanged = true;
+                            }
+
+                            if (jobTag.IsTextColorAppliedToNameplateTitle.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateTitle.InheritedValue.Value)
+                            {
+                                title.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
+                                title.Payloads.Add(new UIForegroundPayload(0));
+                                isTitleChanged = true;
+                            }
+
+                            if (jobTag.IsTextColorAppliedToNameplateFreeCompany.InheritedValue != null && jobTag.IsTextColorAppliedToNameplateFreeCompany.InheritedValue.Value)
+                            {
+                                freeCompany.Payloads.Insert(0, (new UIForegroundPayload(jobTag.TextColor.InheritedValue.Value)));
+                                freeCompany.Payloads.Add(new UIForegroundPayload(0));
+                                isFreeCompanyChanged = true;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }