teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 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 (!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();