From ae8b5a0709df5978bc6385779e9483baf69f181c Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Fri, 6 Jul 2018 23:36:28 +0300
Subject: [PATCH] [Server] Remove hardcoded sync for Place, Spawn & other
 Object packets

---
 apps/openmw-mp/processors/object/ProcessorObjectLock.hpp  | 2 --
 apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp | 5 -----
 apps/openmw-mp/processors/object/ProcessorObjectScale.hpp | 2 --
 apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp | 5 -----
 apps/openmw-mp/processors/object/ProcessorObjectState.hpp | 2 --
 apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp  | 2 --
 6 files changed, 18 deletions(-)

diff --git a/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp b/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
index 001dbeedd..51a4f8742 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
@@ -17,8 +17,6 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
             
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectLock")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };
diff --git a/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp b/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
index f84eca576..51716b6ef 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
@@ -23,11 +23,6 @@ namespace mwmp
                 objectList.baseObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
             }
 
-            // Send this packet back to the original sender with the mpNum generation from above,
-            // then send it to the other players
-            packet.Send(false);
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectPlace")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };
diff --git a/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp b/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
index a95acf413..db65e94e9 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
@@ -17,8 +17,6 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
             
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectScale")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };
diff --git a/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp b/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
index 7ae29c1e0..e0b72d2dd 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
@@ -23,11 +23,6 @@ namespace mwmp
                 objectList.baseObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
             }
 
-            // Send this packet back to the original sender with the mpNum generation from above,
-            // then send it to the other players
-            packet.Send(false);
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectSpawn")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };
diff --git a/apps/openmw-mp/processors/object/ProcessorObjectState.hpp b/apps/openmw-mp/processors/object/ProcessorObjectState.hpp
index b62c76d08..9d01f609a 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectState.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectState.hpp
@@ -17,8 +17,6 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
             
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectState")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };
diff --git a/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp b/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
index 899b4bb77..425445f7d 100644
--- a/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
+++ b/apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
@@ -17,8 +17,6 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player.npc.mName.c_str());
             
-            packet.Send(true);
-
             Script::Call<Script::CallbackIdentity("OnObjectTrap")>(player.getId(), objectList.cell.getDescription().c_str());
         }
     };