From ea13bc635f54fbb705c66b4b21e00b7626debf7e Mon Sep 17 00:00:00 2001
From: Jerom Venneker <jerom.venneker@gmail.com>
Date: Tue, 13 May 2025 22:02:59 +0200
Subject: [PATCH] Fixed recieving items from chests

---
 soh/soh/Enhancements/randomizer/context.cpp       | 8 +++-----
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 2a5968ba4..f38faa1c9 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -485,15 +485,13 @@ void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient
     
     // init the item table with regular items first
     for(int rc = 1; rc <= RC_MAX; rc++) {
-        itemLocationTable[rc].SetPlacedItem(StaticData::GetLocation(static_cast<RandomizerCheck>(rc))->GetVanillaItem());
+        // This may not even be needed
+        const RandomizerGet vanillaItem = StaticData::GetLocation(static_cast<RandomizerCheck>(rc))->GetVanillaItem();
+        itemLocationTable[rc].SetPlacedItem(vanillaItem);
     }
 
     for(const ArchipelagoClient::ApItem& ap_item: scouted_items) {
         const RandomizerCheck rc = StaticData::APcheckToSoh.find(ap_item.locationName)->second;
-        
-        if(rc == RC_KF_MIDOS_TOP_RIGHT_CHEST) {
-            continue;
-        }
 
         if(SlotName == ap_item.playerName) {
             // our item
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index ea8f8c327..df6be1e63 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -312,8 +312,7 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
     } else {
         RandomizerGet vanillaRandomizerGet = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
         GetItemID vanillaItem = (GetItemID)Rando::StaticData::RetrieveItem(vanillaRandomizerGet).GetItemID();
-        GetItemEntry getItemEntry =
-            Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
+        getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
     }
     SPDLOG_TRACE("RC found!");