tweaks: some more fixes to prevent crashes

Author: Jacobwasbeast

Code/client/Games/Skyrim/Actor.cpp

@@ -1371,7 +1371,10 @@ void Actor::DropOrPickUpObject(const Inventory::Entry& arEntry, NiPoint3* apLoca
 
         if (!pDroppedRef)
         {
-            spdlog::warn("Object to pick up not found near target location, {:X}:{:X}.", arEntry.BaseId.ModId, arEntry.BaseId.BaseId);
+            spdlog::warn("Object to pick up not found near target location, {:X}:{:X}. Falling back to inventory add.", arEntry.BaseId.ModId, arEntry.BaseId.BaseId);
+
+            ScopedInventoryOverride _;
+            AddOrRemoveItem(arEntry, true);
             return;
         }
 

Code/client/Services/Generic/InventoryService.cpp

@@ -129,7 +129,8 @@ void InventoryService::OnEquipmentChangeEvent(const EquipmentChangeEvent& acEven
     if (!modSystem.GetServerModId(acEvent.ItemId, request.ItemId))
         return;
 
-    request.Count = acEvent.Count;
+    const int32_t cEffectiveCount = acEvent.Count == 0 ? 1 : acEvent.Count;
+    request.Count = cEffectiveCount;
     request.Unequip = acEvent.Unequip;
     request.IsSpell = acEvent.IsSpell;
     request.IsShout = acEvent.IsShout;
@@ -138,7 +139,7 @@ void InventoryService::OnEquipmentChangeEvent(const EquipmentChangeEvent& acEven
 
     m_transport.Send(request);
 
-    spdlog::info("Sending equipment request, item: {:X}, count: {}, target object: {:X}", acEvent.ItemId, acEvent.Count, acEvent.ActorId);
+    spdlog::info("Sending equipment request, item: {:X}, count: {}, target object: {:X}", acEvent.ItemId, cEffectiveCount, acEvent.ActorId);
 }
 
 void InventoryService::OnNotifyInventoryChanges(const NotifyInventoryChanges& acMessage) noexcept
@@ -324,9 +325,11 @@ void InventoryService::ApplyEquipmentChange(Actor* pActor, const NotifyEquipment
     auto* pObject = Cast<TESBoundObject>(pItem);
 
     // TODO: ExtraData necessary? probably
+    const int32_t count = acMessage.Count == 0 ? 1 : acMessage.Count;
+
     if (acMessage.Unequip)
     {
-        pEquipManager->UnEquip(pActor, pItem, nullptr, acMessage.Count, pEquipSlot, false, true, false, false, nullptr);
+        pEquipManager->UnEquip(pActor, pItem, nullptr, count, pEquipSlot, false, true, false, false, nullptr);
     }
     else
     {
@@ -344,7 +347,7 @@ void InventoryService::ApplyEquipmentChange(Actor* pActor, const NotifyEquipment
             }
         }
 
-        pEquipManager->Equip(pActor, pItem, nullptr, acMessage.Count, pEquipSlot, false, true, false, false);
+        pEquipManager->Equip(pActor, pItem, nullptr, count, pEquipSlot, false, true, false, false);
 
         for (const auto& armor : wornArmor.Entries)
         {

Code/client/Services/Generic/QuestService.cpp

@@ -150,47 +150,50 @@ BSTEventResult QuestService::OnEvent(const TESQuestStageEvent* apEvent, const Ev
 
 void QuestService::OnQuestUpdate(const NotifyQuestUpdate& aUpdate) noexcept
 {
-    ModSystem& modSystem = World::Get().GetModSystem();
-    uint32_t formId = modSystem.GetGameId(aUpdate.Id);
-    TESQuest* pQuest = Cast<TESQuest>(TESForm::GetById(formId));
-    if (!pQuest)
+    m_world.GetRunner().Queue([this, update = aUpdate]()
     {
-        spdlog::error("Failed to find quest, base id: {:X}, mod id: {:X}", aUpdate.Id.BaseId, aUpdate.Id.ModId);
-        return;
-    }
+        ModSystem& modSystem = World::Get().GetModSystem();
+        uint32_t formId = modSystem.GetGameId(update.Id);
+        TESQuest* pQuest = Cast<TESQuest>(TESForm::GetById(formId));
+        if (!pQuest)
+        {
+            spdlog::error("Failed to find quest, base id: {:X}, mod id: {:X}", update.Id.BaseId, update.Id.ModId);
+            return;
+        }
 
-    if (pQuest->type == TESQuest::Type::None || pQuest->type == TESQuest::Type::Miscellaneous)
-    {
-        spdlog::info(__FUNCTION__ ": receiving type none/misc quest update gameId {:X} questStage {} questStatus {} questType {} formId {:X} name {}",
-                     aUpdate.Id.LogFormat(), aUpdate.Stage, aUpdate.Status,
-                     aUpdate.ClientQuestType, formId, pQuest->fullName.value.AsAscii());
-    }
+        if (pQuest->type == TESQuest::Type::None || pQuest->type == TESQuest::Type::Miscellaneous)
+        {
+            spdlog::info(__FUNCTION__ ": receiving type none/misc quest update gameId {:X} questStage {} questStatus {} questType {} formId {:X} name {}",
+                         update.Id.LogFormat(), update.Stage, update.Status,
+                         update.ClientQuestType, formId, pQuest->fullName.value.AsAscii());
+        }
 
-    bool bResult = false;
-    switch (aUpdate.Status)
-    {
-    case NotifyQuestUpdate::Started:
-    {
-        pQuest->ScriptSetStage(aUpdate.Stage);
-        pQuest->SetActive(true);
-        bResult = true;
-        spdlog::info("Remote quest started: {:X}, stage: {}", formId, aUpdate.Stage);
-        break;
-    }
-    case NotifyQuestUpdate::StageUpdate:
-        pQuest->ScriptSetStage(aUpdate.Stage);
-        bResult = true;
-        spdlog::info("Remote quest updated: {:X}, stage: {}", formId, aUpdate.Stage);
-        break;
-    case NotifyQuestUpdate::Stopped:
-        bResult = StopQuest(formId);
-        spdlog::info("Remote quest stopped: {:X}, stage: {}", formId, aUpdate.Stage);
-        break;
-    default: break;
-    }
+        bool bResult = false;
+        switch (update.Status)
+        {
+        case NotifyQuestUpdate::Started:
+        {
+            pQuest->ScriptSetStage(update.Stage);
+            pQuest->SetActive(true);
+            bResult = true;
+            spdlog::info("Remote quest started: {:X}, stage: {}", formId, update.Stage);
+            break;
+        }
+        case NotifyQuestUpdate::StageUpdate:
+            pQuest->ScriptSetStage(update.Stage);
+            bResult = true;
+            spdlog::info("Remote quest updated: {:X}, stage: {}", formId, update.Stage);
+            break;
+        case NotifyQuestUpdate::Stopped:
+            bResult = StopQuest(formId);
+            spdlog::info("Remote quest stopped: {:X}, stage: {}", formId, update.Stage);
+            break;
+        default: break;
+        }
 
-    if (!bResult)
-        spdlog::error("Failed to update the client quest state, quest: {:X}, stage: {}, status: {}", formId, aUpdate.Stage, aUpdate.Status);
+        if (!bResult)
+            spdlog::error("Failed to update the client quest state, quest: {:X}, stage: {}, status: {}", formId, update.Stage, update.Status);
+    });
 }
 
 bool QuestService::StopQuest(uint32_t aformId)

Code/server/Services/InventoryService.cpp

@@ -118,11 +118,13 @@ void InventoryService::OnEquipmentChanges(const PacketEvent<RequestEquipmentChan
         return;
     }
 
+    const auto effectiveCount = message.Count == 0 ? 1 : message.Count;
+
     NotifyEquipmentChanges notify;
     notify.ServerId = message.ServerId;
     notify.ItemId = message.ItemId;
     notify.EquipSlotId = message.EquipSlotId;
-    notify.Count = message.Count;
+    notify.Count = effectiveCount;
     notify.Unequip = message.Unequip;
     notify.IsSpell = message.IsSpell;
     notify.IsShout = message.IsShout;