[Client] Fix crash for invalid CellRefs in MechanicsHelper::getTarget()

7 years ago · 4eb72eecb1
parent 4b30a44816
commit 4eb72eecb1
1 changed files with 11 additions and 6 deletions
--- a/apps/openmw/mwmp/MechanicsHelper.cpp
+++ b/apps/openmw/mwmp/MechanicsHelper.cpp
@ -112,11 +112,16 @@ mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
    {
        MWWorld::CellRef *ptrRef = &ptr.getCellRef();
        
-        target.isPlayer = false;
-        target.refId = ptrRef->getRefId();
-        target.refNumIndex = ptrRef->getRefNum().mIndex;
-        target.mpNum = ptrRef->getMpNum();
-        target.name = ptr.getClass().getName(ptr);
+        if (ptrRef)
+        {
+            target.isPlayer = false;
+            target.refId = ptrRef->getRefId();
+            target.refNumIndex = ptrRef->getRefNum().mIndex;
+            target.mpNum = ptrRef->getMpNum();
+            target.name = ptr.getClass().getName(ptr);
+        }
+        else
+            clearTarget(target);
    }

    return target;