From 48c63dbce9600bb5c30d1a2d3781480780454db8 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 22 Jun 2017 05:49:44 +0300
Subject: [PATCH] [General] Fix ObjectLock packets by making hasCellData true
 for them

---
 apps/openmw-mp/Script/ScriptFunctions.hpp               | 2 +-
 apps/openmw/CMakeLists.txt                              | 2 +-
 components/openmw-mp/Packets/World/PacketObjectLock.cpp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index b2bcd4f9e..d2682316b 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -130,7 +130,7 @@ public:
             {"OnPlayerDeath",            Function<void, unsigned short>()},
             {"OnPlayerResurrect",        Function<void, unsigned short>()},
             {"OnPlayerCellChange",       Function<void, unsigned short>()},
-            {"OnPlayerKillCount",     Function<void, unsigned short>()},
+            {"OnPlayerKillCount",        Function<void, unsigned short>()},
             {"OnPlayerAttribute",        Function<void, unsigned short>()},
             {"OnPlayerSkill",            Function<void, unsigned short>()},
             {"OnPlayerLevel",            Function<void, unsigned short>()},
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 97503b77b..580b932f1 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -112,7 +112,7 @@ add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags P
     )
 
 add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGUIMessageBox ProcessorHandshake ProcessorUserDisconnected
-    ProcessorUserMyID  ProcessorGameSettings ProcessorGameTime ProcessorGameWeather ProcessorPlayerBaseInfo
+    ProcessorUserMyID ProcessorGameSettings ProcessorGameTime ProcessorGameWeather ProcessorPlayerBaseInfo
     ProcessorPlayerAnimFlags ProcessorPlayerAnimPlay ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBook
     ProcessorPlayerBounty ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass ProcessorPlayerCharGen
     ProcessorPlayerDeath ProcessorPlayerDisposition ProcessorPlayerEquipment ProcessorPlayerFaction ProcessorPlayerInventory
diff --git a/components/openmw-mp/Packets/World/PacketObjectLock.cpp b/components/openmw-mp/Packets/World/PacketObjectLock.cpp
index d2e49f046..83b8ec5ac 100644
--- a/components/openmw-mp/Packets/World/PacketObjectLock.cpp
+++ b/components/openmw-mp/Packets/World/PacketObjectLock.cpp
@@ -6,6 +6,7 @@ using namespace mwmp;
 PacketObjectLock::PacketObjectLock(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
 {
     packetID = ID_OBJECT_LOCK;
+    hasCellData = true;
 }
 
 void PacketObjectLock::Object(WorldObject &worldObject, bool send)