From 9c502da39513b3a3a7a634fd93c60190eb6df663 Mon Sep 17 00:00:00 2001 From: MysterD Date: Thu, 17 Mar 2022 00:03:57 -0700 Subject: [PATCH] Update local networkplayer before calling level hooks --- src/game/level_update.c | 8 ++++++++ src/pc/network/packets/packet_sync_valid.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/game/level_update.c b/src/game/level_update.c index 28ae39a6d..8e62b50c9 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -522,6 +522,11 @@ void init_mario_after_warp(void) { } #endif } + + if (gNetworkPlayerLocal != NULL) { + network_player_update_course_level(gNetworkPlayerLocal, gCurrCourseNum, gCurrActStarNum, gCurrLevelNum, gCurrAreaIndex); + } + smlua_call_event_hooks(HOOK_ON_WARP); } @@ -1415,6 +1420,9 @@ s32 init_level(void) { sound_banks_disable(SEQ_PLAYER_SFX, SOUND_BANKS_DISABLED_DURING_INTRO_CUTSCENE); } + if (gNetworkPlayerLocal != NULL) { + network_player_update_course_level(gNetworkPlayerLocal, gCurrCourseNum, gCurrActStarNum, gCurrLevelNum, gCurrAreaIndex); + } smlua_call_event_hooks(HOOK_ON_LEVEL_INIT); return 1; diff --git a/src/pc/network/packets/packet_sync_valid.c b/src/pc/network/packets/packet_sync_valid.c index 677299659..710c1f5a6 100644 --- a/src/pc/network/packets/packet_sync_valid.c +++ b/src/pc/network/packets/packet_sync_valid.c @@ -6,6 +6,7 @@ void network_send_sync_valid(struct NetworkPlayer* toNp, s16 courseNum, s16 actNum, s16 levelNum, s16 areaIndex) { if (toNp == gNetworkPlayerLocal && !toNp->currAreaSyncValid) { + network_player_update_course_level(toNp, courseNum, actNum, levelNum, areaIndex); smlua_call_event_hooks(HOOK_ON_SYNC_VALID); } @@ -61,6 +62,7 @@ void network_receive_sync_valid(struct Packet* p) { } if (np == gNetworkPlayerLocal && !np->currAreaSyncValid) { + network_player_update_course_level(np, courseNum, actNum, levelNum, areaIndex); smlua_call_event_hooks(HOOK_ON_SYNC_VALID); }