From 2e57e256752b8474e2a5baf69bef0d4cf92d4e0d Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 22 Oct 2016 18:19:57 +0300 Subject: [PATCH] Only delete object from ID_WORLD_OBJECT_DELETE if it actually exists --- apps/openmw/mwmp/Networking.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 174a348ac..69dd5ef86 100644 --- 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; }