From 1f2bda1f82e415c01258e27f62b1056b19880e4e Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Wed, 19 May 2021 11:43:39 +0100 Subject: [PATCH] add null referencetransform check --- .../RigidbodySync/UnparentedBaseRigidbodySync.cs | 11 ++++++++++- QSB/Syncs/TransformSync/BaseTransformSync.cs | 16 ++++++++++------ .../TransformSync/UnparentedBaseTransformSync.cs | 11 ++++++++++- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/QSB/Syncs/RigidbodySync/UnparentedBaseRigidbodySync.cs b/QSB/Syncs/RigidbodySync/UnparentedBaseRigidbodySync.cs index 56dd0d33..6ae0344b 100644 --- a/QSB/Syncs/RigidbodySync/UnparentedBaseRigidbodySync.cs +++ b/QSB/Syncs/RigidbodySync/UnparentedBaseRigidbodySync.cs @@ -153,6 +153,11 @@ namespace QSB.Syncs.RigidbodySync return; } + if (ReferenceTransform == null) + { + return; + } + UpdateTransform(); base.Update(); @@ -225,7 +230,11 @@ namespace QSB.Syncs.RigidbodySync private void OnRenderObject() { - if (!QSBCore.WorldObjectsReady || !QSBCore.DebugMode || !QSBCore.ShowLinesInDebug || !IsReady) + if (!QSBCore.WorldObjectsReady + || !QSBCore.DebugMode + || !QSBCore.ShowLinesInDebug + || !IsReady + || ReferenceTransform == null) { return; } diff --git a/QSB/Syncs/TransformSync/BaseTransformSync.cs b/QSB/Syncs/TransformSync/BaseTransformSync.cs index c0c21a49..e155a36e 100644 --- a/QSB/Syncs/TransformSync/BaseTransformSync.cs +++ b/QSB/Syncs/TransformSync/BaseTransformSync.cs @@ -177,6 +177,11 @@ namespace QSB.Syncs.TransformSync return; } + if (ReferenceTransform == null) + { + return; + } + UpdateTransform(); base.Update(); @@ -262,12 +267,11 @@ namespace QSB.Syncs.TransformSync private void OnRenderObject() { - if (!QSBCore.WorldObjectsReady || !QSBCore.DebugMode || !QSBCore.ShowLinesInDebug || !IsReady) - { - return; - } - - if (ReferenceTransform == null) + if (!QSBCore.WorldObjectsReady + || !QSBCore.DebugMode + || !QSBCore.ShowLinesInDebug + || !IsReady + || ReferenceTransform == null) { return; } diff --git a/QSB/Syncs/TransformSync/UnparentedBaseTransformSync.cs b/QSB/Syncs/TransformSync/UnparentedBaseTransformSync.cs index b158be41..33a25f05 100644 --- a/QSB/Syncs/TransformSync/UnparentedBaseTransformSync.cs +++ b/QSB/Syncs/TransformSync/UnparentedBaseTransformSync.cs @@ -130,6 +130,11 @@ namespace QSB.Syncs.TransformSync return; } + if (ReferenceTransform == null) + { + return; + } + UpdateTransform(); base.Update(); @@ -191,7 +196,11 @@ namespace QSB.Syncs.TransformSync private void OnRenderObject() { - if (!QSBCore.WorldObjectsReady || !QSBCore.DebugMode || !QSBCore.ShowLinesInDebug || !IsReady) + if (!QSBCore.WorldObjectsReady + || !QSBCore.DebugMode + || !QSBCore.ShowLinesInDebug + || !IsReady + || ReferenceTransform == null) { return; }