From d0491e33f0daef2171c71472dc36fd109f4a1317 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Thu, 27 Jan 2022 01:54:53 -0800 Subject: [PATCH] >:( --- .../TransformSync/JellyfishTransformSync.cs | 12 ------------ QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs index daa0fd8d..eb0d7a61 100644 --- a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs +++ b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs @@ -14,7 +14,6 @@ namespace QSB.JellyfishSync.TransformSync protected override bool OnlyApplyOnDeserialize => true; private QSBJellyfish _qsbJellyfish; - private AlignWithTargetBody _alignWithTargetBody; private static readonly List _instances = new(); protected override OWRigidbody InitAttachedRigidbody() @@ -51,8 +50,6 @@ namespace QSB.JellyfishSync.TransformSync AttachedRigidbody.OnUnsuspendOWRigidbody += OnUnsuspend; AttachedRigidbody.OnSuspendOWRigidbody += OnSuspend; netIdentity.SendAuthQueueMessage(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add); - - _alignWithTargetBody = AttachedRigidbody.GetComponent(); } protected override void Uninit() @@ -71,18 +68,9 @@ namespace QSB.JellyfishSync.TransformSync private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Add); private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.SendAuthQueueMessage(AuthQueueAction.Remove); - protected override void GetFromAttached() - { - _alignWithTargetBody.enabled = true; - - base.GetFromAttached(); - } - /// replacement using SetPosition/Rotation instead of Move protected override void ApplyToAttached() { - _alignWithTargetBody.enabled = false; - var pos = ReferenceTransform.FromRelPos(transform.position); AttachedRigidbody.SetPosition(pos); AttachedRigidbody.SetRotation(ReferenceTransform.FromRelRot(transform.rotation)); diff --git a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs index e34061a2..e75afbdb 100644 --- a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs +++ b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs @@ -16,6 +16,8 @@ namespace QSB.JellyfishSync.WorldObjects public override void Init() { + Object.Destroy(AttachedObject.GetComponent()); + if (QSBCore.IsHost) { Object.Instantiate(QSBNetworkManager.singleton.JellyfishPrefab).SpawnWithServerAuthority();