From 810f6a428f5dff718d93e4878fd93a11908e4351 Mon Sep 17 00:00:00 2001
From: teascade <teascade@gmail.com>
Date: Thu, 11 May 2017 05:03:07 +0300
Subject: [PATCH] Fix client receiving their own interaction messages

---
 Assets/Scripts/Networking/Clientside/Client.cs    |  5 ++++-
 .../Scripts/Networking/Messages/InteractionPkt.cs | 15 +++++++++++----
 Assets/Scripts/Networking/Serverside/Server.cs    |  4 +++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Assets/Scripts/Networking/Clientside/Client.cs b/Assets/Scripts/Networking/Clientside/Client.cs
index e25e54c..3aa8b36 100644
--- a/Assets/Scripts/Networking/Clientside/Client.cs
+++ b/Assets/Scripts/Networking/Clientside/Client.cs
@@ -200,8 +200,11 @@ namespace Cyber.Networking.Clientside {
             case (PktType.InteractPkt):
                 InteractionPkt Interaction = new InteractionPkt();
                 Interaction.Deserialize(msg.reader);
+                if (Interaction.OwnerSyncBaseID == Player.Character.ID) {
+                    break;
+                }
 
-                SyncBase Target = Spawner.SyncDB.Get(Interaction.SyncBaseID);
+                SyncBase Target = Spawner.SyncDB.Get(Interaction.InteractSyncBaseID);
                 if (Target != null && Target is Interactable) {
                     ((Interactable) Target).Interact();
                 } else {
diff --git a/Assets/Scripts/Networking/Messages/InteractionPkt.cs b/Assets/Scripts/Networking/Messages/InteractionPkt.cs
index 86f304e..aa1af53 100644
--- a/Assets/Scripts/Networking/Messages/InteractionPkt.cs
+++ b/Assets/Scripts/Networking/Messages/InteractionPkt.cs
@@ -11,14 +11,19 @@ namespace Cyber.Networking.Messages {
         /// <summary>
         /// ID of the interactible.
         /// </summary>
-        public int SyncBaseID;
+        public int InteractSyncBaseID;
+
+        /// <summary>
+        /// Id of the interactor.
+        /// </summary>
+        public int OwnerSyncBaseID;
 
         /// <summary>
         /// Creates an InteraktionPkt, which contains the message "someone interacted".
         /// </summary>
         /// <param name="SyncBaseID"></param>
         public InteractionPkt(int syncBaseID) {
-            SyncBaseID = syncBaseID;
+            InteractSyncBaseID = syncBaseID;
         }
 
         /// <summary>
@@ -31,7 +36,8 @@ namespace Cyber.Networking.Messages {
         /// </summary>
         /// <param name="reader"></param>
         public override void Deserialize(NetworkReader reader) {
-            SyncBaseID = reader.ReadInt32();
+            InteractSyncBaseID = reader.ReadInt32();
+            OwnerSyncBaseID = reader.ReadInt32();
         }
 
         /// <summary>
@@ -39,7 +45,8 @@ namespace Cyber.Networking.Messages {
         /// </summary>
         /// <param name="writer"></param>
         public override void Serialize(NetworkWriter writer) {
-            writer.Write(SyncBaseID);
+            writer.Write(InteractSyncBaseID);
+            writer.Write(OwnerSyncBaseID);
         }
 
     }
diff --git a/Assets/Scripts/Networking/Serverside/Server.cs b/Assets/Scripts/Networking/Serverside/Server.cs
index 0025704..17077a5 100644
--- a/Assets/Scripts/Networking/Serverside/Server.cs
+++ b/Assets/Scripts/Networking/Serverside/Server.cs
@@ -177,7 +177,9 @@ namespace Cyber.Networking.Serverside {
                 Interaction.Deserialize(msg.reader);
 
                 Character Sender = Players[msg.conn.connectionId].Character;
-                SyncBase Target = Spawner.SyncDB.Get(Interaction.SyncBaseID);
+                SyncBase Target = Spawner.SyncDB.Get(Interaction.InteractSyncBaseID);
+
+                Interaction.OwnerSyncBaseID = Sender.ID;
 
                 if (Target != null && Target is Interactable) {
                     Interactable Interacted = (Interactable) Target;