bounds fix in CompShieldField

AndroidQuazar · May 15, 2022 · 3a91ec2 · 3a91ec2
1 parent 82386ad
commit 3a91ec2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/1.3/Assemblies/VFECore.dll b/1.3/Assemblies/VFECore.dll
diff --git a/Source/VFECore/VFECore/Comps/ThingComps/CompShieldField.cs b/Source/VFECore/VFECore/Comps/ThingComps/CompShieldField.cs
@@ -152,10 +152,13 @@ public IEnumerable<Thing> ThingsWithinRadius
             {
                 foreach (var cell in coveredCells)
                 {
-                    var thingList = cell.GetThingList(HostThing.Map);
-                    for (int i = 0; i < thingList.Count; i++)
+                    if (cell.InBounds(HostThing.Map))
                     {
-                        yield return thingList[i];
+                        var thingList = cell.GetThingList(HostThing.Map);
+                        for (int i = 0; i < thingList.Count; i++)
+                        {
+                            yield return thingList[i];
+                        }
                     }
                 }
             }
@@ -165,16 +168,18 @@ public IEnumerable<Thing> ThingsWithinScanArea
         {
             get
             {
-
                 foreach (var cell in scanCells)
                 {
-                    var thingList = cell.GetThingList(HostThing.Map);
-                    for (int i = 0; i < thingList.Count; i++)
+                    if (cell.InBounds(HostThing.Map))
                     {
-                        var thing = thingList[i];
-                        var distance = Vector3.Distance(this.HostThing.TrueCenter().Yto0(), thing.TrueCenter().Yto0());
-                        if (distance <= ShieldRadius)
-                            yield return thing;
+                        var thingList = cell.GetThingList(HostThing.Map);
+                        for (int i = 0; i < thingList.Count; i++)
+                        {
+                            var thing = thingList[i];
+                            var distance = Vector3.Distance(this.HostThing.TrueCenter().Yto0(), thing.TrueCenter().Yto0());
+                            if (distance <= ShieldRadius)
+                                yield return thing;
+                        }
                     }
                 }
             }