fix(2121): hide guild name if name hidden, cleanup code (AscensionGameDev#2139)

Author: pandinocoder

Intersect.Client/Entities/Entity.cs

@@ -337,7 +337,7 @@ public virtual int SpriteFrames
             }
         }
 
-        public IMapInstance MapInstance => Maps.MapInstance.Get(MapId);
+        public IMapInstance? MapInstance => Maps.MapInstance.Get(MapId);
 
         public virtual Guid MapId { get; set; }
 
@@ -922,26 +922,7 @@ public virtual int CalculateAttackTime()
         /// <summary>
         /// Returns whether this entity is Stealthed or not.
         /// </summary>
-        public virtual bool IsStealthed
-        {
-            get
-            {
-                if (this == Globals.Me)
-                {
-                    return false;
-                }
-
-                for (var n = 0; n < Status.Count; n++)
-                {
-                    if (Status[n].Type == SpellEffect.Stealth)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
+        public virtual bool IsStealthed => this != Globals.Me && Status.Any(t => t.Type == SpellEffect.Stealth);
 
         /// <summary>
         /// Returns whether this entity should be drawn.

Intersect.Client/Entities/Player.cs

@@ -2468,58 +2468,52 @@ private void DrawNameAndLabels(Color textColor, Color borderColor, Color backgro
             DrawGuildName(textColor, borderColor, backgroundColor);
         }
 
-        public virtual void DrawGuildName(Color textColor, Color borderColor = null, Color backgroundColor = null)
+        public virtual void DrawGuildName(Color textColor, Color? borderColor = default, Color? backgroundColor = default)
         {
-            if (HideName || Guild == null || Guild.Trim().Length == 0 || !Options.Instance.Guild.ShowGuildNameTagsOverMembers)
+            var guildLabel = Guild?.Trim();
+            if (!ShouldDrawName || string.IsNullOrWhiteSpace(guildLabel) || !Options.Instance.Guild.ShowGuildNameTagsOverMembers)
             {
                 return;
             }
 
-            if (borderColor == null)
+            if (IsStealthed && !IsInMyParty(Globals.Me))
             {
-                borderColor = Color.Transparent;
-            }
-
-            if (backgroundColor == null)
-            {
-                backgroundColor = Color.Transparent;
-            }
-
-            //Check for stealth amoungst status effects.
-            for (var n = 0; n < Status.Count; n++)
-            {
-                //If unit is stealthed, don't render unless the entity is the player.
-                if (Status[n].Type == SpellEffect.Stealth)
-                {
-                    if (this != Globals.Me && !(this is Player player && Globals.Me.IsInMyParty(player)))
-                    {
-                        return;
-                    }
-                }
+                // Do not render if the party is stealthed and not in the local player's party
+                return;
             }
 
-            var map = MapInstance;
-            if (map == null)
+            if (MapInstance == default)
             {
                 return;
             }
 
-            var textSize = Graphics.Renderer.MeasureText(Guild, Graphics.EntityNameFont, 1);
+            var textSize = Graphics.Renderer.MeasureText(guildLabel, Graphics.EntityNameFont, 1);
 
             var x = (int)Math.Ceiling(Origin.X);
             var y = GetLabelLocation(LabelType.Guild);
 
+            backgroundColor ??= Color.Transparent;
             if (backgroundColor != Color.Transparent)
             {
                 Graphics.DrawGameTexture(
-                    Graphics.Renderer.GetWhiteTexture(), new FloatRect(0, 0, 1, 1),
-                    new FloatRect(x - textSize.X / 2f - 4, y, textSize.X + 8, textSize.Y), backgroundColor
+                    Graphics.Renderer.GetWhiteTexture(),
+                    new FloatRect(0, 0, 1, 1),
+                    new FloatRect(x - textSize.X / 2f - 4, y, textSize.X + 8, textSize.Y),
+                    backgroundColor
                 );
             }
 
+            borderColor ??= Color.Transparent;
             Graphics.Renderer.DrawString(
-                Guild, Graphics.EntityNameFont, x - (int)Math.Ceiling(textSize.X / 2f), (int)y, 1,
-                Color.FromArgb(textColor.ToArgb()), true, null, Color.FromArgb(borderColor.ToArgb())
+                guildLabel,
+                Graphics.EntityNameFont,
+                x - (int)Math.Ceiling(textSize.X / 2f),
+                (int)y,
+                1,
+                Color.FromArgb(textColor.ToArgb()),
+                true,
+                default,
+                Color.FromArgb(borderColor.ToArgb())
             );
         }
 

Intersect.sln.DotSettings

@@ -5,5 +5,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Migratable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Paperdoll/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=plaindata/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomblob/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
-	
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=pname/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomblob/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Renderable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=stealthed/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>