Update Main.cs

developer9998 · Sep 9, 2024 · c56fb34 · c56fb34
1 parent 3059468
commit c56fb34
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/GorillaShirts/Behaviours/Main.cs b/GorillaShirts/Behaviours/Main.cs
@@ -438,7 +438,7 @@ public async Task InitCatalog()
                     {
                         Logging.Info("Using shirt from previous session '" + myShirt.DisplayName + "' in pack '" + myPack.DisplayName + "'");
                         SelectedShirt = myShirt;
-                        UpdatePlayerHash();
+                        UpdatePlayerHash(true);
                     }
                 }
             }
@@ -508,7 +508,7 @@ public void Update()
 
         public void UpdatePlayerHash(bool shouldToggleShirt = false)
         {
-            Shirt currentShirt = SelectedShirt;
+            Shirt currentShirt = shouldToggleShirt ? SelectedShirt : LocalRig.Rig.Shirt;
 
             if (currentShirt != null && currentShirt == LocalRig.Rig.Shirt && shouldToggleShirt)
             {
@@ -647,11 +647,12 @@ public void CheckHash(Player targetPlayer, Hashtable changedProps)
                     {
                         CustomProperties = changedProps;
                         LocalRig.Rig.NameTagOffset = Configuration.CurrentTagOffset.Value;
+                        Stand.Display.SetTag(Configuration.CurrentTagOffset.Value);
                     }
-                    else if (shirtRig.Rig.NameTagOffset != tagOffset)
+                    else
                     {
                         Logging.Info($"{targetPlayer.NickName} has a name tag offset of {tagOffset}");
-                        shirtRig.Rig.NameTagOffset = tagOffset;
+                        shirtRig.Rig.OffsetNameTag(tagOffset);
                     }
 
                     string wornGorillaShirt = (string)gsHash[0];