mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-07-04 21:36:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Desync the great fairy cutscene (#6860)

Browse Source 
When 2 players are in the fairy fountain and 1 activates the great fairy cutscene, it can force the other player into the cutscene as well, and I've had some crashes arbitrarily too so this guarentees that doesnt happen.
This commit is contained in:
Amber Burton
2026-07-03 23:40:06 -04:00
committed by GitHub
parent b09c0733e2
commit f59d9172d6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Network/Anchor/Packets/SetFlag.cpp
+7 -1
View File
@@ -69,11 +69,17 @@ void Anchor::HandlePacket_SetFlag(nlohmann::json payload) {
return;
}
// Special case: Ignore Tower Collapse timer start.
// Special case: Ignore tower collapse timer start, stored 0x36.
if (sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR && flagType == FLAG_SCENE_SWITCH && flag == 0x36) {
return;
}
// Special case: Ignore Great Fairy cutscenes, stored 0x38.
if ((sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC || sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS) &&
flagType == FLAG_SCENE_SWITCH && flag == 0x38) {
return;
}
auto effect = new GameInteractionEffect::SetSceneFlag();
effect->parameters[0] = sceneNum;
effect->parameters[1] = flagType;