From b15f6a9f17b9e6b7c833d6e7e6ce0d2e7ab223a6 Mon Sep 17 00:00:00 2001
From: Mister_Nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 28 Jan 2021 08:34:55 +0000
Subject: [PATCH] fix

---
 QSB/QuantumSync/QuantumManager.cs                | 1 +
 QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/QSB/QuantumSync/QuantumManager.cs b/QSB/QuantumSync/QuantumManager.cs
index 3bbebcd6..6cad1f7b 100644
--- a/QSB/QuantumSync/QuantumManager.cs
+++ b/QSB/QuantumSync/QuantumManager.cs
@@ -42,6 +42,7 @@ namespace QSB.QuantumSync
 
 			foreach (var item in Resources.FindObjectsOfTypeAll<QuantumObject>())
 			{
+				DebugLog.DebugWrite($"adding tracker to {item.gameObject.name}");
 				item.gameObject.AddComponent<OnEnableDisableTracker>();
 			}
 		}
diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
index e49cc465..3d2f487b 100644
--- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
+++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
@@ -16,7 +16,7 @@ namespace QSB.QuantumSync.WorldObjects
 			var tracker = (AttachedObject as Component).gameObject.AddComponent<OnEnableDisableTracker>();
 			tracker.OnEnableEvent += OnEnable;
 			tracker.OnDisableEvent += OnDisable;
-			ControllingPlayer = 0;
+			ControllingPlayer = QSBCore.IsServer ? 1u : 0u;
 		}
 
 		private void OnEnable()
@@ -27,7 +27,7 @@ namespace QSB.QuantumSync.WorldObjects
 				return;
 			}
 			var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
-			//DebugLog.DebugWrite($"ON ENABLE {(this as WorldObject<T>).AttachedObject.name} ({id})");
+			DebugLog.DebugWrite($"ON ENABLE {(this as WorldObject<T>).AttachedObject.name} ({id})");
 			// no one is controlling this object right now, request authority
 			GlobalMessenger<int, uint>.FireEvent(EventNames.QSBQuantumAuthority, id, QSBPlayerManager.LocalPlayerId);
 			ControllingPlayer = QSBPlayerManager.LocalPlayerId;
@@ -41,7 +41,7 @@ namespace QSB.QuantumSync.WorldObjects
 				return;
 			}
 			var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
-			//DebugLog.DebugWrite($"ON DISABLE {(this as WorldObject<T>).AttachedObject.name} ({id})");
+			DebugLog.DebugWrite($"ON DISABLE {(this as WorldObject<T>).AttachedObject.name} ({id})");
 			// send event to other players that we're releasing authority
 			GlobalMessenger<int, uint>.FireEvent(EventNames.QSBQuantumAuthority, id, 0);
 			ControllingPlayer = 0;