diff --git a/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs b/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs index 5a3ae377..460bcf1e 100644 --- a/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs +++ b/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs @@ -113,14 +113,14 @@ namespace QSB.Syncs.Sectored.Rigidbodies return true; } - var targetPos = ReferenceTransform.DecodePos(transform.position); - var targetRot = ReferenceTransform.DecodeRot(transform.rotation); - - if (targetPos == Vector3.zero || transform.position == Vector3.zero) + if (transform.position == Vector3.zero) { return false; } + var targetPos = ReferenceTransform.DecodePos(transform.position); + var targetRot = ReferenceTransform.DecodeRot(transform.rotation); + var positionToSet = targetPos; var rotationToSet = targetRot; diff --git a/QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs b/QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs index 6d923c7e..f7d06aed 100644 --- a/QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs +++ b/QSB/Syncs/Sectored/Transforms/SectoredTransformSync.cs @@ -81,7 +81,7 @@ namespace QSB.Syncs.Sectored.Transforms var targetPos = transform.position; var targetRot = transform.rotation; - if (targetPos != Vector3.zero && ReferenceTransform.DecodePos(transform.position) != Vector3.zero) + if (targetPos != Vector3.zero) { if (UseInterpolation) { diff --git a/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs b/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs index 179078fc..a7f73003 100644 --- a/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs +++ b/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs @@ -79,11 +79,6 @@ namespace QSB.Syncs.Unsectored.Rigidbodies transform.rotation = rot; _relativeVelocity = relativeVelocity; _relativeAngularVelocity = relativeAngularVelocity; - - if (transform.position == Vector3.zero) - { - // DebugLog.ToConsole($"Warning - {_logName} at (0,0,0)! - Given position was {pos}", MessageType.Warning); - } } protected void SetValuesToSync() @@ -105,11 +100,6 @@ namespace QSB.Syncs.Unsectored.Rigidbodies var targetPos = ReferenceTransform.DecodePos(transform.position); var targetRot = ReferenceTransform.DecodeRot(transform.rotation); - if (targetPos == Vector3.zero || transform.position == Vector3.zero) - { - return false; - } - var positionToSet = targetPos; var rotationToSet = targetRot; diff --git a/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs b/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs index f08a20fb..867952c9 100644 --- a/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs +++ b/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs @@ -45,11 +45,6 @@ namespace QSB.Syncs.Unsectored.Transforms transform.position = pos; transform.rotation = rot; - - if (transform.position == Vector3.zero) - { - //DebugLog.ToConsole($"Warning - {_logName} at (0,0,0)! - Given position was {pos}", MessageType.Warning); - } } protected override bool UpdateTransform() @@ -63,22 +58,15 @@ namespace QSB.Syncs.Unsectored.Transforms var targetPos = ReferenceTransform.DecodePos(transform.position); var targetRot = ReferenceTransform.DecodeRot(transform.rotation); - if (targetPos != Vector3.zero && ReferenceTransform.DecodePos(transform.position) != Vector3.zero) + if (UseInterpolation) { - if (UseInterpolation) - { - AttachedObject.transform.position = SmartSmoothDamp(AttachedObject.transform.position, targetPos); - AttachedObject.transform.rotation = QuaternionHelper.SmoothDamp(AttachedObject.transform.rotation, targetRot, ref _rotationSmoothVelocity, SmoothTime); - } - else - { - AttachedObject.transform.position = targetPos; - AttachedObject.transform.rotation = targetRot; - } + AttachedObject.transform.position = SmartSmoothDamp(AttachedObject.transform.position, targetPos); + AttachedObject.transform.rotation = QuaternionHelper.SmoothDamp(AttachedObject.transform.rotation, targetRot, ref _rotationSmoothVelocity, SmoothTime); } - else if (targetPos == Vector3.zero) + else { - DebugLog.ToConsole($"Warning - TargetPos for {LogName} was (0,0,0).", MessageType.Warning); + AttachedObject.transform.position = targetPos; + AttachedObject.transform.rotation = targetRot; } return true;