[Physics] Fix reattach logic where component hasn't been attached yet (#2465)

Basewq · web-flow · commit 90522b7bc6d5 · 2024-09-24T11:14:43.000+02:00
Co-authored-by: Basewq &lt;Basewq@users.noreply.github.com&gt;
diff --git a/sources/engine/Stride.Physics/Elements/RigidbodyComponent.cs b/sources/engine/Stride.Physics/Elements/RigidbodyComponent.cs
@@ -119,7 +119,7 @@ public override ColliderShape ColliderShape
 
                 if (InternalRigidBody == null)
                 {
-                    if (!attachInProgress)
+                    if (Data != null && !attachInProgress)
                     {
                         //When setting ColliderShape, setup could have been previously skipped (eg when PhysicsComponent is created using GetOrCreate)
                         ReAttach();
diff --git a/sources/engine/Stride.Physics/Engine/PhysicsComponent.cs b/sources/engine/Stride.Physics/Engine/PhysicsComponent.cs
@@ -698,6 +698,10 @@ internal void Attach(PhysicsProcessor.AssociatedData data)
         /// </summary>
         internal void ReAttach()
         {
+            if (Data == null)
+            {
+                throw new InvalidOperationException("PhysicsComponent has not been attached yet.");
+            }
             //TODO: Could consider fully detaching and then rebuilding, but ideally this would cause null refs on Rigidbody OnDetach calls
             //Shouldnt call detach, because at this point the user has added new components and this runs as a check to rebuild as needed.
             //Entire wipes to rebuild causes loss in the data that the user has just added (and is slower)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public override ColliderShape ColliderShape`
`119`	`119`
`120`	`120`	`if (InternalRigidBody == null)`
`121`	`121`	`{`
`122`		`- if (!attachInProgress)`
	`122`	`+ if (Data != null && !attachInProgress)`
`123`	`123`	`{`
`124`	`124`	`//When setting ColliderShape, setup could have been previously skipped (eg when PhysicsComponent is created using GetOrCreate)`
`125`	`125`	`ReAttach();`