From bbdc30628bc0c46196d5e0236ead080b4f0634c1 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Wed, 21 Mar 2018 06:08:04 +0200
Subject: [PATCH] [Client] Use the correct guid for a received WorldEvent or
 ActorList

---
 apps/openmw/mwmp/processors/ActorProcessor.cpp | 3 ++-
 apps/openmw/mwmp/processors/WorldProcessor.cpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmp/processors/ActorProcessor.cpp b/apps/openmw/mwmp/processors/ActorProcessor.cpp
index 6f61d6766..42c46881c 100644
--- a/apps/openmw/mwmp/processors/ActorProcessor.cpp
+++ b/apps/openmw/mwmp/processors/ActorProcessor.cpp
@@ -15,6 +15,7 @@ bool ActorProcessor::Process(RakNet::Packet &packet, ActorList &actorList)
 {
     RakNet::BitStream bsIn(&packet.data[1], packet.length, false);
     bsIn.Read(guid);
+    actorList.guid = guid;
 
     ActorPacket *myPacket = Main::get().getNetworking()->getActorPacket(packet.data[0]);
 
@@ -44,4 +45,4 @@ bool ActorProcessor::Process(RakNet::Packet &packet, ActorList &actorList)
         }
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwmp/processors/WorldProcessor.cpp b/apps/openmw/mwmp/processors/WorldProcessor.cpp
index a1fc95bb5..67689e55b 100644
--- a/apps/openmw/mwmp/processors/WorldProcessor.cpp
+++ b/apps/openmw/mwmp/processors/WorldProcessor.cpp
@@ -15,6 +15,7 @@ bool WorldProcessor::Process(RakNet::Packet &packet, WorldEvent &event)
 {
     RakNet::BitStream bsIn(&packet.data[1], packet.length, false);
     bsIn.Read(guid);
+    event.guid = guid;
 
     WorldPacket *myPacket = Main::get().getNetworking()->getWorldPacket(packet.data[0]);