From 44a1831698f38306968757b0805b1f087f12f451 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sun, 2 Apr 2023 14:44:52 -0700
Subject: [PATCH] Fix desync when changing areas

---
 src/pc/network/sync_object.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pc/network/sync_object.c b/src/pc/network/sync_object.c
index cec1f28e0..9b82fb73c 100644
--- a/src/pc/network/sync_object.c
+++ b/src/pc/network/sync_object.c
@@ -54,7 +54,10 @@ void sync_objects_update(void) {
     while (entry) {
         struct SyncObjectForgetEntry* next = entry->next;
         if (entry->forgetTimer == FORGET_TIMEOUT) {
-            hmap_del(sSoMap, entry->so->id);
+            struct SyncObject* currentSo = sync_object_get(entry->so->id);
+            if (currentSo == entry->so) {
+                hmap_del(sSoMap, entry->so->id);
+            }
         }
 
         if (entry->forgetTimer-- <= 0) {
@@ -63,7 +66,7 @@ void sync_objects_update(void) {
             } else {
                 sForgetList = next;
             }
-            //LOG_INFO("Freeing sync object... (%d)", entry->so->id);
+            //LOG_INFO("Freeing sync object %u : %s\n", entry->so->id, get_behavior_name_from_id(get_id_from_behavior(entry->so->behavior)));
             free(entry->so);
             free(entry);
 
@@ -128,7 +131,8 @@ void sync_object_forget(u32 syncId) {
         }
         entry->next = newEntry;
     }
-    //LOG_INFO("Scheduling sync object to free... (%d)", so->id);
+    //LOG_INFO("Scheduling sync object to free %u : %s\n", so->id, get_behavior_name_from_id(get_id_from_behavior(so->behavior)));
+
 }
 
 void sync_object_forget_last_reliable_packet(u32 syncId) {