Patch for active bodies leak

Equinox- · Mar 7, 2024 · d6001b0 · d6001b0
1 parent 46300e2
commit d6001b0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Meds.Wrapper/Shim/MecPatches.cs b/Meds.Wrapper/Shim/MecPatches.cs
@@ -4,13 +4,15 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using HarmonyLib;
+using Havok;
 using Medieval.Entities.Components;
 using Medieval.Entities.Components.Crafting;
 using Medieval.GameSystems;
 using Medieval.World.Persistence;
 using Meds.Wrapper.Utils;
 using Microsoft.Extensions.Logging;
 using Sandbox.Engine.Multiplayer;
+using Sandbox.Engine.Physics;
 using Sandbox.Game.Entities.Character;
 using Sandbox.Game.Entities.Entity.Stats;
 using Sandbox.Game.EntityComponents;
@@ -683,4 +685,19 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
             return instructions;
         }
     }
+
+    // https://communityedition.medievalengineers.com/mantis/view.php?id=419a
+    [HarmonyPatch(typeof(MyPhysicsSandbox), nameof(MyPhysicsSandbox.CreateHkWorld))]
+    [AlwaysPatch(VersionRange = "[,0.7.4)")]
+    public static class MecUnidentifiedActiveRigidBodiesLeak
+    {
+        public static void Postfix(HkWorld __result)
+        {
+            __result.OnRigidBodyRemoved += body =>
+            {
+                if (body is HkRigidBody rb)
+                    __result.ActiveRigidBodies.Remove(rb);
+            };
+        }
+    }
 }
diff --git a/Meds.Wrapper/Shim/MiscPatches.cs b/Meds.Wrapper/Shim/MiscPatches.cs
@@ -28,7 +28,7 @@ private static bool CorrectSpawnPosition(float charSizeRad, ref MatrixD position
             {
                 var okay = PositionPayload.TryCreate(originalLocation, out var positionPayload, player?.Identity?.Id);
                 Entrypoint.LoggerFor(typeof(MyMedievalPlanetRespawnComponent))
-                    .ZLogInformationWithPayload(StackUtils.CaptureGameLogicStackPayload(),
+                    .ZLogInformation(
                         "Failed to correct spawn location on call {0} while spawning {1} ({2}).  Originally at {3} ({4}/{5}/{6})",
                         call,
                         player?.Id.SteamId,
@@ -43,7 +43,7 @@ private static bool CorrectSpawnPosition(float charSizeRad, ref MatrixD position
             {
                 var okay = PositionPayload.TryCreate(originalLocation, out var positionPayload, player?.Identity?.Id);
                 Entrypoint.LoggerFor(typeof(MyMedievalPlanetRespawnComponent))
-                    .ZLogInformationWithPayload(StackUtils.CaptureGameLogicStackPayload(),
+                    .ZLogInformation(
                         "Corrected spawn location on call {0} while spawning {1} ({2}).  Originally at {3} ({4}/{5}/{6}), moved {7}m",
                         call,
                         player?.Id.SteamId,