diff --git a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs index 65a121f6..c1771c0e 100644 --- a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs +++ b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs @@ -53,7 +53,7 @@ namespace QSB.Anglerfish.TransformSync AttachedRigidbody.OnUnsuspendOWRigidbody += OnUnsuspend; AttachedRigidbody.OnSuspendOWRigidbody += OnSuspend; - netIdentity.SendAuthQueueMessage(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); + netIdentity.UpdateAuthQueue(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); } protected override void Uninit() @@ -64,8 +64,8 @@ namespace QSB.Anglerfish.TransformSync AttachedRigidbody.OnSuspendOWRigidbody -= OnSuspend; } - private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Add); - private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Remove); + private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Add); + private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Remove); protected override void OnRenderObject() { diff --git a/QSB/AuthoritySync/AuthQueueMessage.cs b/QSB/AuthoritySync/AuthQueueMessage.cs index 15579f29..af4ab582 100644 --- a/QSB/AuthoritySync/AuthQueueMessage.cs +++ b/QSB/AuthoritySync/AuthQueueMessage.cs @@ -32,7 +32,7 @@ namespace QSB.AuthoritySync public override bool ShouldReceive => QSBWorldSync.AllObjectsReady; public override void OnReceiveLocal() => OnReceiveRemote(); - public override void OnReceiveRemote() => NetworkServer.spawned[NetId].UpdateAuthQueue(From, Value); + public override void OnReceiveRemote() => NetworkServer.spawned[NetId].ServerUpdateAuthQueue(From, Value); } public enum AuthQueueAction diff --git a/QSB/AuthoritySync/AuthorityManager.cs b/QSB/AuthoritySync/AuthorityManager.cs index 2aed053c..d03ea7ff 100644 --- a/QSB/AuthoritySync/AuthorityManager.cs +++ b/QSB/AuthoritySync/AuthorityManager.cs @@ -17,7 +17,7 @@ namespace QSB.AuthoritySync public static void RegisterAuthQueue(this NetworkIdentity identity) => _authQueue.Add(identity, new List()); public static void UnregisterAuthQueue(this NetworkIdentity identity) => _authQueue.Remove(identity); - public static void UpdateAuthQueue(this NetworkIdentity identity, uint id, AuthQueueAction action) + public static void ServerUpdateAuthQueue(this NetworkIdentity identity, uint id, AuthQueueAction action) { var authQueue = _authQueue[identity]; var oldOwner = authQueue.Count != 0 ? authQueue[0] : uint.MaxValue; @@ -53,7 +53,7 @@ namespace QSB.AuthoritySync var id = conn.GetPlayerId(); foreach (var identity in _authQueue.Keys) { - identity.UpdateAuthQueue(id, AuthQueueAction.Remove); + identity.ServerUpdateAuthQueue(id, AuthQueueAction.Remove); } } @@ -82,7 +82,7 @@ namespace QSB.AuthoritySync #region any client - public static void SendAuthQueueMessage(this NetworkIdentity identity, AuthQueueAction action) => + public static void UpdateAuthQueue(this NetworkIdentity identity, AuthQueueAction action) => new AuthQueueMessage(identity.netId, action).Send(); #endregion diff --git a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs index 208b9fc1..1051113a 100644 --- a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs +++ b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs @@ -56,7 +56,7 @@ namespace QSB.JellyfishSync.TransformSync AttachedRigidbody.OnUnsuspendOWRigidbody += OnUnsuspend; AttachedRigidbody.OnSuspendOWRigidbody += OnSuspend; - netIdentity.SendAuthQueueMessage(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); + netIdentity.UpdateAuthQueue(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); } protected override void Uninit() @@ -67,8 +67,8 @@ namespace QSB.JellyfishSync.TransformSync AttachedRigidbody.OnSuspendOWRigidbody -= OnSuspend; } - private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Add); - private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Remove); + private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Add); + private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Remove); protected override void Serialize(NetworkWriter writer) { diff --git a/QSB/OrbSync/Messages/OrbDragMessage.cs b/QSB/OrbSync/Messages/OrbDragMessage.cs index 0c3e9abc..e0d4e5b6 100644 --- a/QSB/OrbSync/Messages/OrbDragMessage.cs +++ b/QSB/OrbSync/Messages/OrbDragMessage.cs @@ -12,7 +12,7 @@ namespace QSB.OrbSync.Messages { if (QSBCore.IsHost && Value) { - WorldObject.TransformSync.netIdentity.UpdateAuthQueue(From, AuthQueueAction.Force); + WorldObject.TransformSync.netIdentity.ServerUpdateAuthQueue(From, AuthQueueAction.Force); } } diff --git a/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs b/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs index 50bbfd85..780da8a6 100644 --- a/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs +++ b/QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs @@ -31,7 +31,7 @@ namespace QSB.OrbSync.TransformSync if (QSBCore.IsHost) { netIdentity.RegisterAuthQueue(); - netIdentity.UpdateAuthQueue(QSBPlayerManager.LocalPlayerId, AuthQueueAction.Add); + netIdentity.ServerUpdateAuthQueue(QSBPlayerManager.LocalPlayerId, AuthQueueAction.Add); } base.OnStartClient(); @@ -61,7 +61,7 @@ namespace QSB.OrbSync.TransformSync body.OnSuspendOWRigidbody += OnSuspend; if (!QSBCore.IsHost) { - netIdentity.SendAuthQueueMessage(body.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); + netIdentity.UpdateAuthQueue(body.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); } } @@ -82,7 +82,7 @@ namespace QSB.OrbSync.TransformSync } } - private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Add); - private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Remove); + private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Add); + private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Remove); } }