Fix bug in LocationIntSet.Except

joelverhagen · Jan 17, 2024 · eee8dcf · eee8dcf
1 parent fde2377
commit eee8dcf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/FactorioTools/OilField/Containers/LocationIntSet.cs b/src/FactorioTools/OilField/Containers/LocationIntSet.cs
@@ -74,8 +74,17 @@ public void UnionWith(ILocationSet other)
 
     public void ExceptWith(ILocationSet other)
     {
-        var otherSet = ValidateSameDimensions(other);
-        _set.ExceptWith(otherSet._set);
+        if (other.Count == 0)
+        {
+            return;
+        }
+        else
+        {
+            foreach (var item in other.EnumerateItems())
+            {
+                _set.Remove(GetIndex(item));
+            }
+        }
     }
 
     public bool SetEquals(ILocationSet other)

diff --git a/src/lua/FactorioTools/LocationIntSet.lua b/src/lua/FactorioTools/LocationIntSet.lua
@@ -84,8 +84,19 @@ System.namespace("Knapcode.FactorioTools.OilField", function (namespace)
       end
     end
     ExceptWith = function (this, other)
-      local otherSet = ValidateSameDimensions(this, other)
-      this._set:ExceptWith(otherSet._set)
+      if other:getCount() == 0 then
+        return
+      else
+        for _, item in System.each(other:EnumerateItems()) do
+          -- inline Knapcode.FactorioTools.OilField.LocationIntSet.GetIndex(Knapcode.FactorioTools.OilField.Location)
+          local default
+          do
+            local location = item
+            default = location.Y * this._width + location.X
+          end
+          this._set:Remove(default)
+        end
+      end
     end
     SetEquals = function (this, other)
       local otherSet = ValidateSameDimensions(this, other)