From 0ab4117499c673667bac14c31c95f856895b19c9 Mon Sep 17 00:00:00 2001
From: Kai <norybiak@gmail.com>
Date: Thu, 8 Apr 2021 09:27:51 -0700
Subject: [PATCH] Actor will properly receive default ownership when
 authoritative user is assigned (#744)

---
 packages/sdk/src/core/contextInternal.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/sdk/src/core/contextInternal.ts b/packages/sdk/src/core/contextInternal.ts
index fa2bff78..7d78fab7 100644
--- a/packages/sdk/src/core/contextInternal.ts
+++ b/packages/sdk/src/core/contextInternal.ts
@@ -451,11 +451,15 @@ export class ContextInternal {
 			actor.copy(sactor);
 			if (isNewActor) {
 				newActorIds.push(actor.id);
-				if (actor.rigidBody) {	
+				if (actor.rigidBody) {
 					if (!actor.owner) {
-						actor.owner = this._rigidBodyDefaultOwner;
+						if (!this._rigidBodyDefaultOwner) {
+							this._rigidBodyOrphanSet.add(actor.id);
+						} else {
+							actor.owner = this._rigidBodyDefaultOwner;
+							this._rigidBodyOwnerMap.set(actor.id, actor.owner);
+						}
 					}
-					this._rigidBodyOwnerMap.set(actor.id, actor.owner);
 				}
 			}
 		});