AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Server] Fix crashes related to reading actor lists in unloaded cells

Browse Source
This commit is contained in:
David Cernat 2020-06-23 01:05:39 +03:00
parent fbc23a3b57
commit 6d10906832
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw-mp/Script/Functions/Actors.cpp
View File

@ -29,7 +29,11 @@ void ActorFunctions::ReadCellActorList(const char* cellDescription) noexcept
{ {
ESM::Cell esmCell = Utils::getCellFromDescription(cellDescription); ESM::Cell esmCell = Utils::getCellFromDescription(cellDescription);
Cell *serverCell = CellController::get()->getCell(&esmCell); Cell *serverCell = CellController::get()->getCell(&esmCell);
if (serverCell != nullptr)
readActorList = serverCell->getActorList(); readActorList = serverCell->getActorList();
else
readActorList = {};
} }
void ActorFunctions::ClearActorList() noexcept void ActorFunctions::ClearActorList() noexcept
@ -53,6 +57,9 @@ void ActorFunctions::CopyReceivedActorListToStore() noexcept
unsigned int ActorFunctions::GetActorListSize() noexcept unsigned int ActorFunctions::GetActorListSize() noexcept
{ {
if (readActorList == nullptr)
return 0;
return readActorList->count; return readActorList->count;
} }