Skip to content

Fix: Remote NPC Weapons Disappearing #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
otsffs wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix: Remote NPC Weapons Disappearing #861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions Code/client/Games/Skyrim/TESObjectREFR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,26 +843,37 @@ void TESObjectREFR::AddOrRemoveItem(const Inventory::Entry& arEntry, bool aIsSet
return;
}

ExtraDataList* pExtraDataList = GetExtraDataFromItem(arEntry);
ExtraDataList* pExtraDataList = nullptr;
Actor* pActor = Cast<Actor>(this);

if(pActor)
{
// NOTE: Custom enchantments cause remote non-player Actor weapons to disappear.
// Remote NPCs typically use default enchanted weapons, so skip custom enchantment sync.
if(!arEntry.IsQuestItem && pActor->GetExtension() && pActor->GetExtension()->IsRemotePlayer())
pExtraDataList = GetExtraDataFromItem(arEntry);
}
else
{
if(!arEntry.IsQuestItem)
pExtraDataList = GetExtraDataFromItem(arEntry);
}

if (arEntry.Count > 0)
{
bool isWorn = false;
bool isWornLeft = false;
if (pExtraDataList)
{
isWorn = pExtraDataList->Contains(ExtraDataType::Worn);
isWornLeft = pExtraDataList->Contains(ExtraDataType::WornLeft);
}
bool isWorn = arEntry.ExtraWorn;
bool isWornLeft = arEntry.ExtraWornLeft;

spdlog::debug("Adding item {:X}, count {}", pObject->formID, arEntry.Count);
AddObjectToContainer(pObject, pExtraDataList, arEntry.Count, nullptr);

// TODO: check Actor cast first?
if (isWorn)
EquipManager::Get()->Equip(Cast<Actor>(this), pObject, nullptr, arEntry.Count, DefaultObjectManager::Get().rightEquipSlot, false, true, false, false);
else if (isWornLeft)
EquipManager::Get()->Equip(Cast<Actor>(this), pObject, nullptr, arEntry.Count, DefaultObjectManager::Get().leftEquipSlot, false, true, false, false);
if(pActor && pActor->GetExtension() && pActor->GetExtension()->IsRemote())
{
if (isWorn)
EquipManager::Get()->Equip(pActor, pObject, nullptr, arEntry.Count, DefaultObjectManager::Get().rightEquipSlot, false, true, false, false);
else if (isWornLeft)
EquipManager::Get()->Equip(pActor, pObject, nullptr, arEntry.Count, DefaultObjectManager::Get().leftEquipSlot, false, true, false, false);
}
}
else if (arEntry.Count < 0)
{
Expand All @@ -876,10 +887,9 @@ void TESObjectREFR::AddOrRemoveItem(const Inventory::Entry& arEntry, bool aIsSet
{
PlayerCharacter* pPlayer = PlayerCharacter::Get();

if (!pPlayer->IsItemInInventory(objectId))
if (pPlayer && !pPlayer->IsItemInInventory(objectId))
{
Actor* pActor = Cast<Actor>(this);
if (pActor && pActor->GetExtension()->IsRemotePlayer())
if (pActor && pActor->GetExtension() && pActor->GetExtension()->IsRemotePlayer())
pPlayer->AddOrRemoveItem(arEntry);
}
}
Expand Down
Loading