Stop WorldPackets about invalid cells from causing framelistener errors

8 years ago · 527024a026
parent a430ee011a
commit 527024a026
1 changed files with 10 additions and 1 deletions
--- a/apps/openmw/mwmp/WorldController.cpp
+++ b/apps/openmw/mwmp/WorldController.cpp
@ -25,7 +25,16 @@ MWWorld::CellStore *mwmp::WorldController::getCell(const ESM::Cell& cell)
    if (cell.isExterior())
        cellStore = MWBase::Environment::get().getWorld()->getExterior(cell.mData.mX, cell.mData.mY);
    else
-        cellStore = MWBase::Environment::get().getWorld()->getInterior(cell.mName);
+    {
+        try
+        {
+            cellStore = MWBase::Environment::get().getWorld()->getInterior(cell.mName);
+        }
+        catch (std::exception&)
+        {
+            cellStore = NULL;
+        }
+    }

    return cellStore;
 }