Fix #377: fix fatal IVA issue triggered by KPBS

-MAS was not properly handling parts that have ModuleWheelDeployment and not ModuleWheelDamage
MOARdV · Nov 9, 2024 · 96244ef · 96244ef
1 parent 0ae8425
commit 96244ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/AvionicsSystems.csproj b/AvionicsSystems.csproj
@@ -150,6 +150,16 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Publicize Include="Assembly-CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Krafs.Publicizer">
+      <Version>2.2.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/Source/MASVesselComputerModules.cs b/Source/MASVesselComputerModules.cs
@@ -1339,11 +1339,14 @@ private void UpdateGear()
                 float numWheels = 0.0f;
                 for (int i = moduleWheelDeployment.Length - 1; i >= 0; --i)
                 {
-                    if (!moduleWheelDamage[i].isDamaged)
+                    var deploymentModule = moduleWheelDeployment[i];
+                    var damageModule = deploymentModule.wheelBase?.wheelDamageSubmodule;
+
+                    if (damageModule == null || !damageModule.isDamaged)
                     {
                         numWheels += 1.0f;
 
-                        newPosition += Mathf.InverseLerp(moduleWheelDeployment[i].retractedPosition, moduleWheelDeployment[i].deployedPosition, moduleWheelDeployment[i].position);
+                        newPosition += Mathf.InverseLerp(deploymentModule.retractedPosition, deploymentModule.deployedPosition, deploymentModule.position);
                     }
                 }