Added isKinematic sync to pickups

Author: marchellcx

LabExtended/API/ExMap.cs

@@ -46,21 +46,26 @@ namespace LabExtended.API;
 public static class ExMap
 {
     private static readonly FacilityZone[] allZones = EnumUtils<FacilityZone>.Values.Except([FacilityZone.None, FacilityZone.Other]).ToArray();
-    
+
     /// <summary>
-    /// List of spawned pickups.
+    /// List of spawned lockers.
     /// </summary>
-    public static List<ItemPickupBase> Pickups { get; } = new();
+    public static List<Locker> Lockers { get; } = new();
 
     /// <summary>
     /// List of spawned ragdolls.
     /// </summary>
     public static List<BasicRagdoll> Ragdolls { get; } = new();
 
     /// <summary>
-    /// List of spawned lockers.
+    /// List of spawned pickups.
     /// </summary>
-    public static List<Locker> Lockers { get; } = new();
+    public static List<ItemPickupBase> Pickups { get; } = new();
+
+    /// <summary>
+    /// List of frozen pickups.
+    /// </summary>
+    public static List<ItemPickupBase> FrozenPickups { get; } = new();
 
     /// <summary>
     /// List of locker chambers.
@@ -703,6 +708,7 @@ private static void OnRagdollRemoved(BasicRagdoll ragdoll)
     private static void OnPickupDestroyed(ItemPickupBase pickup)
     {
         Pickups.Remove(pickup);
+        FrozenPickups.Remove(pickup);
 
         ExPlayer.AllPlayers.ForEach(p => p?.Inventory?.droppedItems?.Remove(pickup));
     }
@@ -716,6 +722,8 @@ private static void OnGenerationStage(MapGenerationPhase phase)
     {
         if (phase is MapGenerationPhase.RoomCoordsRegistrations)
         {
+            FrozenPickups.Clear();
+
             Lockers.Clear();
 
             Chambers.Clear();

LabExtended/Extensions/ItemExtensions.cs

@@ -7,7 +7,6 @@
 using InventorySystem.Items.Usables.Scp1344;
 
 using LabExtended.API;
-using LabExtended.Utilities;
 
 using Mirror;
 
@@ -246,13 +245,19 @@ public static bool FreezePickup(this ItemPickupBase itemPickupBase)
         if (itemPickupBase.PhysicsModule is not PickupStandardPhysics pickupStandardPhysics)
             return false;
 
-        if (pickupStandardPhysics.Rb is null)
+        if (pickupStandardPhysics.Rb == null)
             return false;
 
-        pickupStandardPhysics.Rb.isKinematic = true;
-        pickupStandardPhysics.Rb.constraints = RigidbodyConstraints.FreezeAll;
+        if (!pickupStandardPhysics.Rb.isKinematic)
+        {
+            pickupStandardPhysics.Rb.isKinematic = true;
+            pickupStandardPhysics.Rb.constraints = RigidbodyConstraints.FreezeAll;
+
+            pickupStandardPhysics.ClientFrozen = true;
+
+            ExMap.FrozenPickups.AddUnique(itemPickupBase);
+        }
 
-        pickupStandardPhysics.ClientFrozen = true;
         return true;
     }
 
@@ -273,6 +278,8 @@ public static bool UnfreezePickup(this ItemPickupBase itemPickupBase)
         pickupStandardPhysics.Rb.constraints = RigidbodyConstraints.None;
 
         pickupStandardPhysics.ClientFrozen = false;
+
+        ExMap.FrozenPickups.Remove(itemPickupBase);
         return true;
     }
 

LabExtended/Patches/Fixes/PickupIsKinematicSyncPatch.cs

@@ -0,0 +1,30 @@
+using HarmonyLib;
+using InventorySystem.Items.Pickups;
+
+using LabExtended.API;
+
+namespace LabExtended.Patches.Fixes
+{
+    /// <summary>
+    /// Provides a Harmony patch for synchronizing the kinematic state of pickups, ensuring that frozen pickups are
+    /// correctly reported as kinematic during server freeze checks.
+    /// </summary>
+    public static class PickupIsKinematicSyncPatch
+    {
+        [HarmonyPatch(typeof(PickupStandardPhysics), nameof(PickupStandardPhysics.ServerSendFreeze), MethodType.Getter)]
+        private static bool Prefix(PickupStandardPhysics __instance, ref bool __result)
+        {
+            if (__instance != null
+                && __instance.Pickup != null
+                && __instance.Rb != null 
+                && __instance.Rb.isKinematic 
+                && ExMap.FrozenPickups.Contains(__instance.Pickup))
+            {
+                __result = true;
+                return false;
+            }
+
+            return true;
+        }
+    }
+}