diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index ea7487095..296b6eee3 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -592,7 +592,7 @@ namespace MWScript */ 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(); worldEvent->reset(); @@ -620,7 +620,7 @@ namespace MWScript */ 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(); worldEvent->reset();