diff --git a/src/pc/network/packets/packet_level_macro.c b/src/pc/network/packets/packet_level_macro.c index f858a0572..dcba75923 100644 --- a/src/pc/network/packets/packet_level_macro.c +++ b/src/pc/network/packets/packet_level_macro.c @@ -107,7 +107,6 @@ static void network_send_level_macro_area(struct NetworkPlayer* destNp, u8 areaI void network_send_level_macro(struct NetworkPlayer* destNp) { if (!gNetworkPlayerLocal->currLevelSyncValid) { - LOG_ERROR("my area is invalid"); return; } diff --git a/src/pc/network/packets/packet_level_respawn_info.c b/src/pc/network/packets/packet_level_respawn_info.c index 0e1514180..716d5666e 100644 --- a/src/pc/network/packets/packet_level_respawn_info.c +++ b/src/pc/network/packets/packet_level_respawn_info.c @@ -99,7 +99,6 @@ void network_send_level_respawn_info(struct Object* o, u8 respawnInfoBits) { // make sure our area is valid if (!gNetworkPlayerLocal->currAreaSyncValid) { - LOG_ERROR("my area is invalid"); return; } diff --git a/src/pc/network/packets/packet_level_spawn_info.c b/src/pc/network/packets/packet_level_spawn_info.c index d2b2e6f2e..6b12e2c82 100644 --- a/src/pc/network/packets/packet_level_spawn_info.c +++ b/src/pc/network/packets/packet_level_spawn_info.c @@ -76,7 +76,6 @@ static void network_send_level_spawn_info_area(struct NetworkPlayer* destNp, u8 void network_send_level_spawn_info(struct NetworkPlayer* destNp) { if (!gNetworkPlayerLocal->currAreaSyncValid) { - LOG_ERROR("my area is invalid"); return; } diff --git a/src/pc/network/packets/packet_object.c b/src/pc/network/packets/packet_object.c index a5cd163e5..7cdb6c460 100644 --- a/src/pc/network/packets/packet_object.c +++ b/src/pc/network/packets/packet_object.c @@ -298,8 +298,8 @@ void network_send_object(struct Object* o) { } void network_send_object_reliability(struct Object* o, bool reliable) { + // don't send sync objects while area sync is invalid if (gNetworkPlayerLocal == NULL || !gNetworkPlayerLocal->currAreaSyncValid) { - LOG_INFO("tried to send sync obj when area sync invalid"); return; } // prevent sending objects during credits sequence @@ -468,9 +468,11 @@ void network_update_objects(void) { // check for stale sync object if (so->o->oSyncID != so->id) { - enum BehaviorId bhvId = get_id_from_behavior(so->o->behavior); - const char* bhvName = get_behavior_name_from_id(bhvId); - LOG_ERROR("sync id mismatch: %d vs %d (behavior %s, %d)", so->o->oSyncID, so->id, bhvName != NULL ? bhvName : "NULL", bhvId); + if (so->o->activeFlags != ACTIVE_FLAG_DEACTIVATED) { // check if object was just deleted + enum BehaviorId bhvId = get_id_from_behavior(so->o->behavior); + const char* bhvName = get_behavior_name_from_id(bhvId); + LOG_ERROR("sync id mismatch: %d vs %d (behavior %s, %d)", so->o->oSyncID, so->id, bhvName != NULL ? bhvName : "NULL", bhvId); + } sync_object_forget(so->id); continue; }