AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-27 23:21:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Fix crashes caused by inventory items with disabling scripts

Browse Source
This commit is contained in:
David Cernat 2017-08-11 05:49:33 +03:00
parent f61664ff6d
commit d51736d68f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwscript/interpretercontext.cpp
View File

@ -592,7 +592,7 @@ namespace MWScript
*/ */
if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen()) if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
{ {
if (!ref.getRefData().isEnabled()) if (!ref.getRefData().isEnabled() && ref.getCell() != nullptr)
{ {
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent(); mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset(); worldEvent->reset();
@ -620,7 +620,7 @@ namespace MWScript
*/ */
if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen()) if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
{ {
if (ref.getRefData().isEnabled()) if (ref.getRefData().isEnabled() && ref.getCell() != nullptr)
{ {
mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent(); mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
worldEvent->reset(); worldEvent->reset();