Fix items unequipping when rejoining the server (#2196)

* Fix items unequipping when rejoining the server

* Cleanup equipment processor

* Cleanup EntityMetadataProcessor

* Tweak a log message

* Remove unused import

* Remove dead code

* Remove more dead code (at least I hope it's dead)

* Use better dictionary comparison in WorldPersistenceTest

* Rename ProcessMetadata to TryProcessMetadata

* Remove 1.8 upgrade script since it is impossible to migrate save data from 1.7

Author: SpaceMonkeyy86

Nitrox.Test/Server/Serialization/WorldPersistenceTest.cs

@@ -57,29 +57,6 @@ public void WorldDataTest(PersistedWorldData worldDataAfter, string serializerNa
         StoryTimingTest(worldData.WorldData.GameData.StoryTiming, worldDataAfter.WorldData.GameData.StoryTiming);
     }
 
-    private static void ItemDataTest(ItemData itemData, ItemData itemDataAfter)
-    {
-        Assert.AreEqual(itemData.ContainerId, itemDataAfter.ContainerId);
-        Assert.AreEqual(itemData.ItemId, itemDataAfter.ItemId);
-        Assert.IsTrue(itemData.SerializedData.SequenceEqual(itemDataAfter.SerializedData));
-
-        switch (itemData)
-        {
-            case BasicItemData _ when itemDataAfter is BasicItemData _:
-                break;
-            case EquippedItemData equippedItemData when itemDataAfter is EquippedItemData equippedItemDataAfter:
-                Assert.AreEqual(equippedItemData.Slot, equippedItemDataAfter.Slot);
-                Assert.AreEqual(equippedItemData.TechType, equippedItemDataAfter.TechType);
-                break;
-            case PlantableItemData plantableItemData when itemDataAfter is PlantableItemData plantableItemDataAfter:
-                Assert.AreEqual(plantableItemData.PlantedGameTime, plantableItemDataAfter.PlantedGameTime);
-                break;
-            default:
-                Assert.Fail($"Runtime types of {nameof(ItemData)} where not equal");
-                break;
-        }
-    }
-
     private static void PDAStateTest(PDAStateData pdaState, PDAStateData pdaStateAfter)
     {
         Assert.IsTrue(pdaState.KnownTechTypes.SequenceEqual(pdaStateAfter.KnownTechTypes));
@@ -129,8 +106,11 @@ public void PlayerDataTest(PersistedWorldData worldDataAfter, string serializerN
 
             Assert.IsTrue(playerData.UsedItems.SequenceEqual(playerDataAfter.UsedItems));
             Assert.IsTrue(playerData.QuickSlotsBindingIds.SequenceEqual(playerDataAfter.QuickSlotsBindingIds));
-            AssertHelper.IsListEqual(playerData.EquippedItems.OrderBy(x => x.ItemId), playerDataAfter.EquippedItems.OrderBy(x => x.ItemId), ItemDataTest);
-            AssertHelper.IsListEqual(playerData.Modules.OrderBy(x => x.ItemId), playerDataAfter.Modules.OrderBy(x => x.ItemId), ItemDataTest);
+            AssertHelper.IsDictionaryEqual(playerData.EquippedItems, playerDataAfter.EquippedItems, (keyValuePair, keyValuePairAfter) =>
+            {
+                Assert.AreEqual(keyValuePair.Key, keyValuePairAfter.Key);
+                Assert.AreEqual(keyValuePair.Value, keyValuePairAfter.Value);
+            });
 
             Assert.AreEqual(playerData.Id, playerDataAfter.Id);
             Assert.AreEqual(playerData.SpawnPosition, playerDataAfter.SpawnPosition);

NitroxClient/GameLogic/Containers/ContainerAddItemPostProcessor.cs

@@ -6,7 +6,7 @@
 using NitroxClient.GameLogic.InitialSync.Abstract;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
-using NitroxModel.DataStructures.GameLogic;
+using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Packets;
 using UnityEngine;
@@ -16,10 +16,12 @@ namespace NitroxClient.GameLogic.InitialSync;
 public class EquippedItemInitialSyncProcessor : InitialSyncProcessor
 {
     private readonly IPacketSender packetSender;
+    private readonly Entities entities;
 
-    public EquippedItemInitialSyncProcessor(IPacketSender packetSender)
+    public EquippedItemInitialSyncProcessor(IPacketSender packetSender, Entities entities)
     {
         this.packetSender = packetSender;
+        this.entities = entities;
 
         AddDependency<PlayerInitialSyncProcessor>();
         AddDependency<RemotePlayerInitialSyncProcessor>();
@@ -32,44 +34,36 @@ public override IEnumerator Process(InitialPlayerSync packet, WaitScreen.ManualW
 
         using (PacketSuppressor<EntitySpawnedByClient>.Suppress())
         {
-            foreach (EquippedItemData equippedItem in packet.EquippedItems)
+            foreach (KeyValuePair<string, NitroxId> equippedItem in packet.EquippedItems)
             {
-                waitScreenItem.SetProgress(totalEquippedItemsDone, packet.EquippedItems.Count);
+                string slot = equippedItem.Key;
+                NitroxId id = equippedItem.Value;
 
-                GameObject gameObject = SerializationHelper.GetGameObject(equippedItem.SerializedData);
-                NitroxEntity.SetNewId(gameObject, equippedItem.ItemId);
+                waitScreenItem.SetProgress(totalEquippedItemsDone, packet.EquippedItems.Count);
 
+                GameObject gameObject = NitroxEntity.RequireObjectFrom(id);
                 Pickupable pickupable = gameObject.RequireComponent<Pickupable>();
-                Optional<GameObject> opGameObject = NitroxEntity.GetObjectFrom(equippedItem.ContainerId);
 
-                if (opGameObject.HasValue)
-                {
-                    GameObject owner = opGameObject.Value;
+                GameObject player = Player.mainObject;
+                Optional<Equipment> opEquipment = EquipmentHelper.FindEquipmentComponent(player);
 
-                    Optional<Equipment> opEquipment = EquipmentHelper.FindEquipmentComponent(owner);
-
-                    if (opEquipment.HasValue)
-                    {
-                        Equipment equipment = opEquipment.Value;
-                        InventoryItem inventoryItem = new(pickupable);
-                        inventoryItem.container = equipment;
-                        inventoryItem.item.Reparent(equipment.tr);
+                if (opEquipment.HasValue)
+                {
+                    Equipment equipment = opEquipment.Value;
+                    InventoryItem inventoryItem = new(pickupable);
+                    inventoryItem.container = equipment;
+                    inventoryItem.item.Reparent(equipment.tr);
 
-                        Dictionary<string, InventoryItem> itemsBySlot = equipment.equipment;
-                        itemsBySlot[equippedItem.Slot] = inventoryItem;
+                    Dictionary<string, InventoryItem> itemsBySlot = equipment.equipment;
+                    itemsBySlot[slot] = inventoryItem;
 
-                        equipment.UpdateCount(pickupable.GetTechType(), true);
-                        Equipment.SendEquipmentEvent(pickupable, 0, owner, equippedItem.Slot);
-                        equipment.NotifyEquip(equippedItem.Slot, inventoryItem);
-                    }
-                    else
-                    {
-                        Log.Info($"Could not find equipment type for {gameObject.name}");
-                    }
+                    equipment.UpdateCount(pickupable.GetTechType(), true);
+                    Equipment.SendEquipmentEvent(pickupable, 0, player, slot);
+                    equipment.NotifyEquip(slot, inventoryItem);
                 }
                 else
                 {
-                    Log.Info($"Could not find Container for {gameObject.name}");
+                    Log.Info($"Could not find equipment type for {gameObject.name}");
                 }
 
                 totalEquippedItemsDone++;