attempt: to fix inventory crashes

Author: Jacobwasbeast

Code/client/Components.h

@@ -15,6 +15,7 @@
 #include <Components/FaceGenComponent.h>
 #include <Components/CacheComponent.h>
 #include <Components/WaitingFor3D.h>
+#include <Components/PendingInventoryComponent.h>
 #include <Components/ActorValuesComponent.h>
 #include <Components/ObjectComponent.h>
 #include <Components/PlayerComponent.h>

Code/client/Components/PendingInventoryComponent.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#ifndef TP_INTERNAL_COMPONENTS_GUARD
+#error Include Components.h instead
+#endif
+
+#include <Structs/Inventory.h>
+
+struct PendingInventoryComponent
+{
+    PendingInventoryComponent() = default;
+
+    PendingInventoryComponent(Inventory aInventory, bool aIsDead, bool aIsWeaponDrawn)
+        : InventoryContent(std::move(aInventory))
+        , IsDead(aIsDead)
+        , IsWeaponDrawn(aIsWeaponDrawn)
+    {
+    }
+
+    Inventory InventoryContent{};
+    bool IsDead{false};
+    bool IsWeaponDrawn{false};
+};

Code/client/Games/Skyrim/Actor.cpp

@@ -833,12 +833,20 @@ void Actor::SetActorInventory(const Inventory& acInventory) noexcept
 
     Inventory currentInventory = GetActorInventory();
 
-    if (!this->GetExtension()->IsPlayer() && currentInventory.ContainsQuestItems())
+    const bool hasQuestItems = currentInventory.ContainsQuestItems();
+    const bool isPlayer = this->GetExtension()->IsPlayer();
+
+    if (!isPlayer && hasQuestItems)
+    {
         SetInventoryRetainingQuestItems(currentInventory, acInventory);
+        SetMagicEquipment(acInventory.CurrentMagicEquipment);
+    }
     else
+    {
         SetInventory(acInventory);
-
-    SetMagicEquipment(acInventory.CurrentMagicEquipment);
+        if (isPlayer || !hasQuestItems)
+            SetMagicEquipment(acInventory.CurrentMagicEquipment);
+    }
 }
 
 void Actor::SetMagicEquipment(const MagicEquipment& acEquipment) noexcept

Code/client/Games/Skyrim/TESObjectREFR.cpp

@@ -772,13 +772,48 @@ void TESObjectREFR::SetInventory(const Inventory& aInventory) noexcept
 
     ScopedInventoryOverride _;
 
-    RemoveAllItems();
+    Inventory currentInventory = GetInventory();
+    Inventory desiredInventory = aInventory;
 
-    for (const Inventory::Entry& entry : aInventory.Entries)
+    // Remove or adjust existing entries
+    for (auto& currentEntry : currentInventory.Entries)
+    {
+        auto matchIt = std::find_if(
+            desiredInventory.Entries.begin(), desiredInventory.Entries.end(),
+            [&currentEntry](const Inventory::Entry& entry) { return entry.BaseId == currentEntry.BaseId && entry.IsExtraDataEquals(currentEntry); });
+
+        const int32_t desiredCount = matchIt != desiredInventory.Entries.end() ? matchIt->Count : 0;
+        const int32_t diff = desiredCount - currentEntry.Count;
+
+        if (diff < 0)
+        {
+            Inventory::Entry removal = currentEntry;
+            removal.Count = diff; // negative count removes items
+            AddOrRemoveItem(removal, true);
+        }
+
+        if (matchIt != desiredInventory.Entries.end())
+        {
+            if (diff > 0)
+            {
+                Inventory::Entry addition = *matchIt;
+                addition.Count = diff;
+                AddOrRemoveItem(addition, true);
+            }
+
+            desiredInventory.Entries.erase(matchIt);
+        }
+    }
+
+    // Add any remaining desired entries that were not present before
+    for (auto& entry : desiredInventory.Entries)
     {
         if (entry.Count != 0)
             AddOrRemoveItem(entry, true);
     }
+
+    if (auto* pActor = Cast<Actor>(this))
+        pActor->SetMagicEquipment(aInventory.CurrentMagicEquipment);
 }
 
 Vector<uint32_t> TESObjectREFR::RemoveNonQuestItems(Inventory& aCurrentInventory) noexcept
@@ -829,6 +864,9 @@ void TESObjectREFR::SetInventoryRetainingQuestItems(Inventory& aCurrentInventory
                 AddOrRemoveItem(entry, true);
         }
     }
+
+    if (auto* pActor = Cast<Actor>(this))
+        pActor->SetMagicEquipment(acSourceInventory.CurrentMagicEquipment);
 }
 
 void TESObjectREFR::AddOrRemoveItem(const Inventory::Entry& arEntry, bool aIsSettingInventory) noexcept

Code/client/Services/Generic/CharacterService.cpp

@@ -361,12 +361,20 @@ void CharacterService::OnAssignCharacter(const AssignCharacterResponse& acMessag
 #endif
 
         pActor->SetActorValues(acMessage.AllActorValues);
-        pActor->SetActorInventory(acMessage.CurrentInventory);
 
-        if (pActor->IsDead() != acMessage.IsDead)
-            acMessage.IsDead ? pActor->Kill() : pActor->Respawn();
+        if (pActor->GetNiNode())
+        {
+            pActor->SetActorInventory(acMessage.CurrentInventory);
 
-        m_weaponDrawUpdates[pActor->formID] = {acMessage.IsWeaponDrawn};
+            if (pActor->IsDead() != acMessage.IsDead)
+                acMessage.IsDead ? pActor->Kill() : pActor->Respawn();
+
+            m_weaponDrawUpdates[pActor->formID] = {acMessage.IsWeaponDrawn};
+        }
+        else
+        {
+            m_world.emplace_or_replace<PendingInventoryComponent>(cEntity, acMessage.CurrentInventory, acMessage.IsDead, acMessage.IsWeaponDrawn);
+        }
 
         MoveActor(pActor, acMessage.WorldSpaceId, acMessage.CellId, acMessage.Position);
     }
@@ -539,11 +547,19 @@ void CharacterService::OnRemoteSpawnDataReceived(const NotifySpawnData& acMessag
         return;
 
     pActor->SetActorValues(acMessage.NewActorData.InitialActorValues);
-    pActor->SetActorInventory(acMessage.NewActorData.InitialInventory);
-    m_weaponDrawUpdates[pActor->formID] = {acMessage.NewActorData.IsWeaponDrawn};
 
-    if (pActor->IsDead() != acMessage.NewActorData.IsDead)
-        acMessage.NewActorData.IsDead ? pActor->Kill() : pActor->Respawn();
+    if (pActor->GetNiNode())
+    {
+        pActor->SetActorInventory(acMessage.NewActorData.InitialInventory);
+        m_weaponDrawUpdates[pActor->formID] = {acMessage.NewActorData.IsWeaponDrawn};
+
+        if (pActor->IsDead() != acMessage.NewActorData.IsDead)
+            acMessage.NewActorData.IsDead ? pActor->Kill() : pActor->Respawn();
+    }
+    else
+    {
+        m_world.emplace_or_replace<PendingInventoryComponent>(*itor, acMessage.NewActorData.InitialInventory, acMessage.NewActorData.IsDead, acMessage.NewActorData.IsWeaponDrawn);
+    }
 
     spdlog::info("Applied remote spawn data, actor form id: {:X}", pActor->formID);
 }
@@ -1579,6 +1595,33 @@ void CharacterService::RunRemoteUpdates() noexcept
 
     for (auto entity : toRemove)
         m_world.remove<WaitingFor3D>(entity);
+
+    auto pendingInventoryView = m_world.view<FormIdComponent, PendingInventoryComponent>();
+    Vector<entt::entity> pendingToRemove;
+
+    for (auto entity : pendingInventoryView)
+    {
+        auto& formIdComponent = pendingInventoryView.get<FormIdComponent>(entity);
+        auto& pendingInventory = pendingInventoryView.get<PendingInventoryComponent>(entity);
+
+        Actor* pActor = Cast<Actor>(TESForm::GetById(formIdComponent.Id));
+        if (!pActor || !pActor->GetNiNode())
+            continue;
+
+        pActor->SetActorInventory(pendingInventory.InventoryContent);
+
+        if (pActor->IsDead() != pendingInventory.IsDead)
+            pendingInventory.IsDead ? pActor->Kill() : pActor->Respawn();
+
+        m_weaponDrawUpdates[pActor->formID] = {pendingInventory.IsWeaponDrawn};
+
+        pendingToRemove.push_back(entity);
+
+        spdlog::info("Applied pending inventory for actor, form id: {:X}", pActor->formID);
+    }
+
+    for (auto entity : pendingToRemove)
+        m_world.remove<PendingInventoryComponent>(entity);
 }
 
 void CharacterService::RunFactionsUpdates() const noexcept