From d3f23220de5bb8ad9287a8256f0ca2e61f86a18e Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Mon, 13 Jul 2020 13:04:02 +0200
Subject: [PATCH] [Client] Only require cellStore for ConsoleCommand packets
 with objects

---
 apps/openmw/mwmp/ObjectList.cpp                                | 3 ++-
 apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp
index a4120d870..778730a0f 100644
--- a/apps/openmw/mwmp/ObjectList.cpp
+++ b/apps/openmw/mwmp/ObjectList.cpp
@@ -934,7 +934,8 @@ void ObjectList::runConsoleCommands(MWWorld::CellStore* cellStore)
                     }
                 }
             }
-            else
+            // Only require a valid cellStore if running on cell objects
+            else if (cellStore)
             {
                 LOG_APPEND(TimedLog::LOG_VERBOSE, "-- Running on object %s %i-%i", baseObject.refId.c_str(), baseObject.refNum, baseObject.mpNum);
 
diff --git a/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp b/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
index d727ba5ce..8c0b1115d 100644
--- a/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
+++ b/apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
@@ -19,8 +19,6 @@ namespace mwmp
 
             ptrCellStore = Main::get().getCellController()->getCellStore(objectList.cell);
 
-            if (!ptrCellStore) return;
-
             objectList.runConsoleCommands(ptrCellStore);
         }
     };