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

7 years ago · d51736d68f
parent f61664ff6d
commit d51736d68f
1 changed files with 2 additions and 2 deletions
--- 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();