From e54aec54072477dd7a7e2d9c6bf9931c5c67fbad Mon Sep 17 00:00:00 2001
From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Date: Wed, 27 Nov 2024 09:57:53 +1000
Subject: [PATCH] fix star spawn cutscene softlock

---
 src/game/behaviors/spawn_star.inc.c    | 4 +++-
 src/pc/network/packets/packet_object.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/behaviors/spawn_star.inc.c b/src/game/behaviors/spawn_star.inc.c
index 688c37204..6dc651680 100644
--- a/src/game/behaviors/spawn_star.inc.c
+++ b/src/game/behaviors/spawn_star.inc.c
@@ -169,7 +169,9 @@ void bhv_star_spawn_loop(void) {
                 o->oInteractStatus = 0;
             }
 
-            network_send_object(o);
+            struct SyncObject* so = sync_object_get(o->oSyncID);
+            so->owned = sync_object_should_own(so->id);
+            if (so->owned) { network_send_object(o); }
             break;
     }
     spawn_star_number();
diff --git a/src/pc/network/packets/packet_object.c b/src/pc/network/packets/packet_object.c
index b1ec3fcae..a5cd163e5 100644
--- a/src/pc/network/packets/packet_object.c
+++ b/src/pc/network/packets/packet_object.c
@@ -436,7 +436,7 @@ void network_receive_object(struct Packet* p) {
     }
 
     // apply platform displacement
-    if (o != NULL) {
+    if (o != NULL && o->collisionData) {
         Vec3f deltaPos = { 0 };
         deltaPos[0] = o->oPosX - oldPos[0];
         deltaPos[2] = o->oPosY - oldPos[1];