[Client] Rework MechanicsHelper::getTarget() to avoid crashes

7 years ago · 509882b5f6
parent 7f0549fc4f
commit 509882b5f6
1 changed files with 22 additions and 20 deletions
--- a/apps/openmw/mwmp/MechanicsHelper.cpp
+++ b/apps/openmw/mwmp/MechanicsHelper.cpp
@ -97,7 +97,10 @@ MWWorld::Ptr MechanicsHelper::getPlayerPtr(const Target& target)
 mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
 {
    mwmp::Target target;
+    clearTarget(target);

+    if (ptr != nullptr)
+    {
        if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
        {
            target.isPlayer = true;
@ -120,8 +123,7 @@ mwmp::Target MechanicsHelper::getTarget(const MWWorld::Ptr& ptr)
                target.mpNum = ptrRef->getMpNum();
                target.name = ptr.getClass().getName(ptr);
            }
-        else
-            clearTarget(target);
+        }
    }

    return target;