From 03944057cd49f627c1abb156b0b7cb258a50447d Mon Sep 17 00:00:00 2001
From: Mister_Nebula <41904486+misternebula@users.noreply.github.com>
Date: Sat, 5 Sep 2020 15:31:09 +0100
Subject: [PATCH] fix some stuff

---
 QSB/OrbSync/OrbUserEvent.cs |  5 ++---
 QSB/OrbSync/QSBOrbSlot.cs   | 12 ++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/QSB/OrbSync/OrbUserEvent.cs b/QSB/OrbSync/OrbUserEvent.cs
index 04cbfbe0..24060d0b 100644
--- a/QSB/OrbSync/OrbUserEvent.cs
+++ b/QSB/OrbSync/OrbUserEvent.cs
@@ -34,9 +34,8 @@ namespace QSB.OrbSync
         {
             var fromPlayer = (NetworkServer.connections.First(x => x.playerControllers[0].gameObject.GetComponent<PlayerTransformSync>().netId.Value == message.FromId));
             DebugLog.DebugWrite($"[S] Setting orb {message.ObjectId} to auth id {message.FromId}");
-            var orbIdentity = WorldRegistry.OrbList
-                .First(x => x.AttachedOrb == WorldRegistry.OldOrbList[message.ObjectId])
-                .GetComponent<NetworkIdentity>();
+            var orb = WorldRegistry.OrbList.First(x => x.AttachedOrb == WorldRegistry.OldOrbList[message.ObjectId]);
+            var orbIdentity = orb.GetComponent<NetworkIdentity>();
             orbIdentity.RemoveClientAuthority(orbIdentity.clientAuthorityOwner);
             orbIdentity.AssignClientAuthority(fromPlayer);
         }
diff --git a/QSB/OrbSync/QSBOrbSlot.cs b/QSB/OrbSync/QSBOrbSlot.cs
index c12388d5..53d2c40f 100644
--- a/QSB/OrbSync/QSBOrbSlot.cs
+++ b/QSB/OrbSync/QSBOrbSlot.cs
@@ -3,7 +3,6 @@ using QSB.WorldSync;
 using System;
 using System.Linq;
 using System.Reflection;
-using UnityEngine.Networking;
 
 namespace QSB.OrbSync
 {
@@ -15,16 +14,13 @@ namespace QSB.OrbSync
         {
             ObjectId = id;
             _interfaceSlot = slot;
-            _interfaceSlot.OnSlotActivated += (slotInstance) => HandleEvent(slotInstance, true);
-            _interfaceSlot.OnSlotDeactivated += (slotInstance) => HandleEvent(slotInstance, false);
+            _interfaceSlot.OnSlotActivated += (slotInstance) => HandleEvent(true);
+            _interfaceSlot.OnSlotDeactivated += (slotInstance) => HandleEvent(false);
         }
 
-        private void HandleEvent(NomaiInterfaceSlot instance, bool state)
+        private void HandleEvent(bool state)
         {
-            if (NetworkServer.active)
-            {
-                GlobalMessenger<int, bool>.FireEvent(EventNames.QSBOrbSlot, ObjectId, state);
-            }
+            GlobalMessenger<int, bool>.FireEvent(EventNames.QSBOrbSlot, ObjectId, state);
         }
 
         public void SetState(bool state)