From d88be7bc5fdd6bf940b2ee3d24494c5fe4aa421b Mon Sep 17 00:00:00 2001
From: Aleksander Waage <alek.ntnu@gmail.com>
Date: Fri, 14 Aug 2020 20:47:03 +0200
Subject: [PATCH] player id hack

---
 QSB/Events/QSBEvent.cs                   | 3 ++-
 QSB/TransformSync/PlayerCameraSync.cs    | 2 +-
 QSB/TransformSync/PlayerProbeSync.cs     | 2 +-
 QSB/TransformSync/PlayerSectorEvent.cs   | 4 +---
 QSB/TransformSync/PlayerTransformSync.cs | 2 +-
 QSB/TransformSync/ShipTransformSync.cs   | 2 +-
 QSB/TransformSync/TransformSync.cs       | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs
index 86171745..f7e5a4ab 100644
--- a/QSB/Events/QSBEvent.cs
+++ b/QSB/Events/QSBEvent.cs
@@ -72,7 +72,8 @@ namespace QSB.Events
 
         private void OnClientReceive(T message)
         {
-            if (message.SenderId == PlayerTransformSync.LocalInstance?.netId.Value)
+            if (message.SenderId == PlayerTransformSync.LocalInstance?.netId.Value ||
+                PlayerRegistry.GetTransformSync(message.SenderId).PlayerId == PlayerTransformSync.LocalInstance?.netId.Value)
             {
                 OnReceiveLocal(message);
                 return;
diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs
index 39e1c25c..92cf4cac 100644
--- a/QSB/TransformSync/PlayerCameraSync.cs
+++ b/QSB/TransformSync/PlayerCameraSync.cs
@@ -13,7 +13,7 @@ namespace QSB.TransformSync
             LocalInstance = this;
         }
 
-        protected override uint PlayerId => netId.Value - 2;
+        public override uint PlayerId => netId.Value - 2;
 
         protected override Transform InitLocalTransform()
         {
diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/TransformSync/PlayerProbeSync.cs
index 64e6e849..2d8ac37c 100644
--- a/QSB/TransformSync/PlayerProbeSync.cs
+++ b/QSB/TransformSync/PlayerProbeSync.cs
@@ -14,7 +14,7 @@ namespace QSB.TransformSync
             LocalInstance = this;
         }
 
-        protected override uint PlayerId => netId.Value - 3;
+        public override uint PlayerId => netId.Value - 3;
 
         private Transform GetProbe()
         {
diff --git a/QSB/TransformSync/PlayerSectorEvent.cs b/QSB/TransformSync/PlayerSectorEvent.cs
index 430729c0..931098c6 100644
--- a/QSB/TransformSync/PlayerSectorEvent.cs
+++ b/QSB/TransformSync/PlayerSectorEvent.cs
@@ -1,8 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
-using System;
-using System.Runtime.InteropServices;
 
 namespace QSB.TransformSync
 {
@@ -43,6 +41,6 @@ namespace QSB.TransformSync
             transformSync.SectorName = message.SectorName;
         }
 
-        public override void OnReceiveLocal(SectorMessage message) => OnReceiveRemote(message);
+        //public override void OnReceiveLocal(SectorMessage message) => OnReceiveRemote(message);
     }
 }
diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs
index e1d65917..3ebf6509 100644
--- a/QSB/TransformSync/PlayerTransformSync.cs
+++ b/QSB/TransformSync/PlayerTransformSync.cs
@@ -17,7 +17,7 @@ namespace QSB.TransformSync
             LocalInstance = this;
         }
 
-        protected override uint PlayerId => netId.Value - 0;
+        public override uint PlayerId => netId.Value - 0;
 
         private Transform GetPlayerModel()
         {
diff --git a/QSB/TransformSync/ShipTransformSync.cs b/QSB/TransformSync/ShipTransformSync.cs
index 1edb27b7..936e65ea 100644
--- a/QSB/TransformSync/ShipTransformSync.cs
+++ b/QSB/TransformSync/ShipTransformSync.cs
@@ -11,7 +11,7 @@ namespace QSB.TransformSync
             LocalInstance = this;
         }
 
-        protected override uint PlayerId => netId.Value - 1;
+        public override uint PlayerId => netId.Value - 1;
 
         private Transform GetShipModel()
         {
diff --git a/QSB/TransformSync/TransformSync.cs b/QSB/TransformSync/TransformSync.cs
index d8d7f29d..ab859db5 100644
--- a/QSB/TransformSync/TransformSync.cs
+++ b/QSB/TransformSync/TransformSync.cs
@@ -36,7 +36,7 @@ namespace QSB.TransformSync
         protected abstract Transform InitLocalTransform();
         protected abstract Transform InitRemoteTransform();
         protected abstract bool IsReady { get; }
-        protected abstract uint PlayerId { get; }
+        public abstract uint PlayerId { get; }
 
         protected void Init()
         {