Only delete object from ID_WORLD_OBJECT_DELETE if it actually exists

8 years ago · 2e57e25675
parent 3c49157ed7
commit 2e57e25675
1 changed files with 7 additions and 4 deletions
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@ -656,11 +656,14 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)

        MWWorld::Ptr ptrFound = ptrCellStore->searchByRefNum(event->cellRef.mRefNum);

-        LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Found %s, %i",
-            ptrFound.getCellRef().getRefId().c_str(),
-            ptrFound.getCellRef().getRefNum());
+        if (ptrFound)
+        {
+            LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Found %s, %i",
+                ptrFound.getCellRef().getRefId().c_str(),
+                ptrFound.getCellRef().getRefNum());

-        MWBase::Environment::get().getWorld()->deleteObject(ptrFound);
+            MWBase::Environment::get().getWorld()->deleteObject(ptrFound);
+        }

        break;
    }