Add sync for prefab picking deleting the giver object (required for melons)

Author: tornac1234

Nitrox.Test/Patcher/Patches/Dynamic/PickPrefab_AddToContainerAsync_PatchTest.cs

@@ -0,0 +1,16 @@
+using HarmonyLib;
+using NitroxTest.Patcher;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+[TestClass]
+public class PickPrefab_AddToContainerAsync_PatchTest
+{
+    [TestMethod]
+    public void Sanity()
+    {
+        IEnumerable<CodeInstruction> originalIl = PatchTestHelper.GetInstructionsFromMethod(PickPrefab_AddToContainerAsync_Patch.TARGET_METHOD);
+        IEnumerable<CodeInstruction> transformedIl = PickPrefab_AddToContainerAsync_Patch.Transpiler(originalIl);
+        transformedIl.Count().Should().Be(originalIl.Count() + 4);
+    }
+}

NitroxClient/GameLogic/SimulationOwnership.cs

@@ -22,7 +22,7 @@ public SimulationOwnership(IMultiplayerSession muliplayerSession, IPacketSender
         }
         public bool PlayerHasMinLockType(NitroxId id, SimulationLockType lockType)
         {
-            if (simulatedIdsByLockType.TryGetValue(id, out SimulationLockType playerLock))
+            if (id != null && simulatedIdsByLockType.TryGetValue(id, out SimulationLockType playerLock))
             {
                 return playerLock <= lockType;
             }

NitroxPatcher/Patches/Dynamic/ItemsContainer_NotifyAddItem_Patch.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
+using NitroxClient.MonoBehaviours;
 using NitroxModel.Helper;
 
 namespace NitroxPatcher.Patches.Dynamic;
@@ -10,7 +11,7 @@ public sealed partial class ItemsContainer_NotifyAddItem_Patch : NitroxPatch, ID
 
     public static void Postfix(ItemsContainer __instance, InventoryItem item)
     {
-        if (item != null)
+        if (item != null && Multiplayer.Main && Multiplayer.Main.InitialSyncCompleted)
         {
             Resolve<ItemContainers>().BroadcastItemAdd(item.item, __instance.tr);
         }

NitroxPatcher/Patches/Dynamic/PickPrefab_AddToContainerAsync_Patch.cs

@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using HarmonyLib;
+using NitroxClient.Communication.Abstract;
+using NitroxModel.DataStructures;
+using NitroxModel.Helper;
+using NitroxModel.Packets;
+using UnityEngine;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+/// <summary>
+/// Sync destruction of giver object when required.
+/// </summary>
+public sealed partial class PickPrefab_AddToContainerAsync_Patch : NitroxPatch, IDynamicPatch
+{
+    internal static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method((PickPrefab t) => t.AddToContainerAsync(default, default)));
+
+    /*
+     * 1st injection:
+     * if (!component)
+     * {
+     *     UnityEngine.Object.Destroy(gameObject);
+     *     BroadcastDeletion(this);      <------- [INSERTED LINE]
+     *  
+     *  2nd injection:
+     *  else if (!container.HasRoomFor(component))
+     *  {
+     *     UnityEngine.Object.Destroy(gameObject);
+     *     BroadcastDeletion(this);      <------- [INSERTED LINE]
+     */
+    public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+    {
+        // The 2 injections are similar (looking for a destroy instruction and adding our callback after it)
+        return new CodeMatcher(instructions).MatchEndForward(new CodeMatch(OpCodes.Call, Reflect.Method(() => Object.Destroy(default))))
+                                            .Advance(1)
+                                            .InsertAndAdvance([
+                                                new CodeInstruction(OpCodes.Ldarg_0),
+                                                new CodeInstruction(OpCodes.Call, Reflect.Method(() => BroadcastDeletion(default)))
+                                            ])
+                                            .MatchEndForward(new CodeMatch(OpCodes.Call, Reflect.Method(() => Object.Destroy(default))))
+                                            .Advance(1)
+                                            .InsertAndAdvance([
+                                                new CodeInstruction(OpCodes.Ldarg_0),
+                                                new CodeInstruction(OpCodes.Call, Reflect.Method(() => BroadcastDeletion(default)))
+                                            ])
+                                            .InstructionEnumeration();
+    }
+
+    public static void BroadcastDeletion(PickPrefab pickPrefab)
+    {
+        if (pickPrefab.TryGetNitroxId(out NitroxId objectId) ||
+            (pickPrefab.TryGetComponent(out GrownPlant grownPlant) && grownPlant.seed && grownPlant.seed.TryGetNitroxId(out objectId)))
+        {
+            Resolve<IPacketSender>().Send(new EntityDestroyed(objectId));
+        }
+    }
+}

NitroxPatcher/Patches/Dynamic/PickPrefab_SetPickedState_Patch.cs

@@ -0,0 +1,20 @@
+using System.Reflection;
+using NitroxModel.Helper;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+/// <summary>
+/// Sync destruction of giver object when required.
+/// </summary>
+public sealed partial class PickPrefab_SetPickedState_Patch : NitroxPatch, IDynamicPatch
+{
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((PickPrefab t) => t.SetPickedState(default));
+
+    public static void Postfix(PickPrefab __instance, bool newPickedState)
+    {
+        if (newPickedState && __instance.destroyOnPicked)
+        {
+            PickPrefab_AddToContainerAsync_Patch.BroadcastDeletion(__instance);
+        }
+    }
+}