From bae8deb473d55c1e086e2cf10b87ec238381bf75 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 21 Oct 2025 00:25:39 +0200 Subject: [PATCH] Fix bad merge conflict resolution --- soh/soh/Enhancements/randomizer/hook_handlers.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 5fdd32ac8..ed8f5a2dc 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -261,9 +261,10 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) { } auto loc = Rando::Context::GetInstance()->GetItemLocation(rc); if (rc != RC_HF_OCARINA_OF_TIME_ITEM) { - if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) + if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) { Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED); - return; + return; + } } SPDLOG_INFO("Queuing RC: {}", static_cast(rc)); randomizerQueuedChecks.push(rc);