From 6c894427b98a453b81acabebf697b8c4c003a0e7 Mon Sep 17 00:00:00 2001
From: Aleksander Waage <alek.ntnu@gmail.com>
Date: Fri, 14 Aug 2020 20:54:15 +0200
Subject: [PATCH] registry cleanup

---
 QSB/Events/QSBEvent.cs | 3 +--
 QSB/PlayerRegistry.cs  | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs
index f7e5a4ab..fdbb6102 100644
--- a/QSB/Events/QSBEvent.cs
+++ b/QSB/Events/QSBEvent.cs
@@ -72,8 +72,7 @@ namespace QSB.Events
 
         private void OnClientReceive(T message)
         {
-            if (message.SenderId == PlayerTransformSync.LocalInstance?.netId.Value ||
-                PlayerRegistry.GetTransformSync(message.SenderId).PlayerId == PlayerTransformSync.LocalInstance?.netId.Value)
+            if (PlayerRegistry.IsBelongingToLocalPlayer(message.SenderId))
             {
                 OnReceiveLocal(message);
                 return;
diff --git a/QSB/PlayerRegistry.cs b/QSB/PlayerRegistry.cs
index af78f7dc..702263d8 100644
--- a/QSB/PlayerRegistry.cs
+++ b/QSB/PlayerRegistry.cs
@@ -8,7 +8,8 @@ namespace QSB
 {
     public static class PlayerRegistry
     {
-        public static PlayerInfo LocalPlayer => GetPlayer(PlayerTransformSync.LocalInstance.netId.Value);
+        public static uint LocalPlayerId => PlayerTransformSync.LocalInstance.netId.Value;
+        public static PlayerInfo LocalPlayer => GetPlayer(LocalPlayerId);
         public static List<PlayerInfo> PlayerList { get; } = new List<PlayerInfo>();
 
         public static List<TransformSync.TransformSync> TransformSyncs { get; } = new List<TransformSync.TransformSync>();
@@ -59,6 +60,11 @@ namespace QSB
             return TransformSyncs.FirstOrDefault(x => x != null && x.netId.Value == id);
         }
 
+        public static bool IsBelongingToLocalPlayer(uint id)
+        {
+            return id == LocalPlayerId || GetTransformSync(id).PlayerId == LocalPlayerId;
+        }
+
         public static AnimationSync GetAnimationSync(uint id)
         {
             return AnimationSyncs.FirstOrDefault(x => x != null && x.netId.Value == id);