From ac27ca663b7226e74f33fdaffcf58288f2e21531 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sun, 20 Aug 2017 06:58:39 +0300
Subject: [PATCH] [Client] Don't send ObjectState packets for items in
 containers

---
 apps/openmw/mwscript/interpretercontext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 296b6eee3..18f05b403 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -592,7 +592,7 @@ namespace MWScript
         */
         if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
         {
-            if (!ref.getRefData().isEnabled() && ref.getCell() != nullptr)
+            if (ref.isInCell() && !ref.getRefData().isEnabled())
             {
                 mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
                 worldEvent->reset();
@@ -620,7 +620,7 @@ namespace MWScript
         */
         if (mwmp::Main::get().getLocalPlayer()->hasFinishedCharGen())
         {
-            if (ref.getRefData().isEnabled() && ref.getCell() != nullptr)
+            if (ref.isInCell() && ref.getRefData().isEnabled())
             {
                 mwmp::WorldEvent *worldEvent = mwmp::Main::get().getNetworking()->getWorldEvent();
                 worldEvent->reset();