Skip to content
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

Jump to bottom

Fix cell-change crash from SetActorInventory() calling s_unequipAll followed by s_removeAllItems #726

Merged
merged 5 commits into from
Oct 26, 2024
+3 −1
Merged

Fix cell-change crash from SetActorInventory() calling s_unequipAll followed by s_removeAllItems #726

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b63023b
Remove redundant UnEquipAll() call which seems to trigger a Skyrim co…
rfortier Oct 23, 2024
49bfc73
Don't accept OnRemoteSpawnDataReceived data for the local PlayerChara…
rfortier Oct 22, 2024
ed79bf1
Loosen the check ALL local NPCs should reject updated remote spawn da…
rfortier Oct 22, 2024
90946c7
Revert "Loosen the check ALL local NPCs should reject updated remote …
rfortier Oct 26, 2024
c53d7c8
Revert "Don't accept OnRemoteSpawnDataReceived data for the local Pla…
rfortier Oct 26, 2024
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
4 changes: 3 additions & 1 deletion Code/client/Games/Skyrim/Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,9 @@ void Actor::SetActorInventory(const Inventory& aInventory) noexcept
{
spdlog::info("Setting inventory for actor {:X}", formID);

UnEquipAll();
// The UnEquipAll() that used to be here is redundant,
// as RemoveAllItems() unequips every item if needed.
// Placing this UnEquipAll() here seems to trigger a Skyrim bug/race.

SetInventory(aInventory);
SetMagicEquipment(aInventory.CurrentMagicEquipment);
Expand Down
Loading