bug fix AscensionGameDev#1716 (AscensionGameDev#2143)

TimtyG · web-flow · commit c40aa5447ff4 · 2023-12-15T15:26:57.000-05:00
* Update to GetHashCode fix AscensionGameDev#1716 * Update to GetHashCode fix AscensionGameDev#1716 2 * Update to GetHashCode fix AscensionGameDev#1716 3
diff --git a/Intersect (Core)/GameObjects/LightBase.cs b/Intersect (Core)/GameObjects/LightBase.cs
@@ -68,7 +68,7 @@ Color color
         /// <returns></returns>
         public override int GetHashCode()
         {
-            return Intensity ^ (int)Expand ^ (Color?.GetHashCode() ?? 0);
+            return HashCode.Combine(Intensity, Expand, Color, TileX, TileY);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public override bool Equals(object obj)
         {
             if (obj is LightBase light)
             {
-                return Intensity == light.Intensity && Color == light.Color&& Expand == light.Expand;
+                return Intensity == light.Intensity && Color == light.Color && Expand == light.Expand && TileX == light.TileX && TileY == light.TileY;
             }
 
             return false;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ Color color`
`68`	`68`	`/// <returns></returns>`
`69`	`69`	`public override int GetHashCode()`
`70`	`70`	`{`
`71`		`- return Intensity ^ (int)Expand ^ (Color?.GetHashCode() ?? 0);`
	`71`	`+ return HashCode.Combine(Intensity, Expand, Color, TileX, TileY);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/// <summary>`
`@@ -80,7 +80,7 @@ public override bool Equals(object obj)`
`80`	`80`	`{`
`81`	`81`	`if (obj is LightBase light)`
`82`	`82`	`{`
`83`		`- return Intensity == light.Intensity && Color == light.Color&& Expand == light.Expand;`
	`83`	`+ return Intensity == light.Intensity && Color == light.Color && Expand == light.Expand && TileX == light.TileX && TileY == light.TileY;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`return false;`