EnterVehiclePositionにInboundsチェックを追加

Author: oelsart

About/About.xml

@@ -7,7 +7,7 @@
 このModはVehicle Frameworkを使用した車両に、床や建築物を建設可能なマップを載せるためのフレームワークMODです。
 這個模組是 **Vehicle Framework** 的擴展，讓車輛能夠變成一張可建造的地圖，你可以在上面蓋地板、建築，打造屬於自己的移動基地！
 	</description>
-  <modVersion IgnoreIfNoMatchingField="True">1.6.188</modVersion>
+  <modVersion IgnoreIfNoMatchingField="True">1.6.189</modVersion>
   <url>https://github.com/oelsart/VehicleMapFramework</url>
   <supportedVersions>
     <li>1.5</li>

Source/VehicleMapFramework/MapComponents/VehicleSectionLayerManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using SmashTools;
 using VehicleMapFramework.VMF_HarmonyPatches;
 using Verse;

Source/VehicleMapFramework/Utilities/CrossMapReachabilityUtility.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using SmashTools;
@@ -95,18 +94,23 @@ public static IntVec3 EnterVehiclePosition(TargetInfo enterSpot, out int dist, V
         var cell = enterSpot.Cell.ToBaseMapCoord(vehicle);
         var faceCell = enterSpot.HasThing ? enterSpot.Thing.BaseFullRotation().FacingCell : enterSpot.Cell.BaseFullDirectionToInsideMap(vehicle).FacingCell;
 
-        dist = 1;
-        while ((cell - (faceCell * dist)).GetThingList(vehicle.Map).Contains(vehicle))
+        dist = 0;
+        IntVec3 cell2;
+        do
         {
             dist++;
-        }
+            cell2 = cell - faceCell * dist;
+            if (!cell2.InBounds(vehicle.Map))
+            {
+                dist = 0;
+                return IntVec3.Invalid;
+            }
+        } while (cell2.GetThingList(vehicle.Map).Contains(vehicle));
         if (enterSpot.Thing is Building_VehicleRamp && dist < 2) dist++;
 
-        var result = cell - (faceCell * dist);
         if (enterer != null)
-        {
-            result -= faceCell * enterer.HalfLength();
-        }
+            dist += enterer.HalfLength();
+        var result = cell - faceCell * dist;
         return result;
     }
 

Source/VehicleMapFramework/VMF_HarmonyPatches/Patches_VehicleFramework.cs

@@ -17,7 +17,6 @@
 using Verse.AI.Group;
 using Verse.Sound;
 using static VehicleMapFramework.MethodInfoCache;
-using static VehicleMapFramework.ModCompat.VehicleFramework;
 using Transform = SmashTools.Rendering.Transform;
 
 namespace VehicleMapFramework.VMF_HarmonyPatches;