Make Flags equality strict about type

sliekens · Jan 26, 2025 · bafb65b · bafb65b
1 parent 2d77d59
commit bafb65b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/GW2SDK/Features/Flags.cs b/GW2SDK/Features/Flags.cs
@@ -17,11 +17,7 @@ public virtual bool Equals(Flags? other)
     {
         if (ReferenceEquals(this, other)) return true;
         if (other is null) return false;
-
-        if (!Other.SequenceEqual(other.Other))
-        {
-            return false;
-        }
+        if (GetType() != other.GetType()) return false;
 
         var flags = GetType()
             .GetProperties(BindingFlags.Public | BindingFlags.Instance)
@@ -30,7 +26,7 @@ public virtual bool Equals(Flags? other)
 
         var left = flags.Select(property => (bool?)property.GetValue(this));
         var right = flags.Select(property => (bool?)property.GetValue(other));
-        return left.SequenceEqual(right);
+        return left.SequenceEqual(right) && Other.SequenceEqual(other.Other);
     }
 
     /// <inheritdoc />
@@ -47,6 +43,11 @@ public override int GetHashCode()
             hash.Add(flag);
         }
 
+        foreach (var flag in Other)
+        {
+            hash.Add(flag);
+        }
+
         return hash.ToHashCode();
     }