oh

NewSoupVi · Jun 23, 2024 · 94789f9 · 94789f9
1 parent f8735e0
commit 94789f9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Source/Archipelago/APRandomizer.cpp b/Source/Archipelago/APRandomizer.cpp
@@ -179,27 +179,29 @@ bool APRandomizer::Connect(std::string& server, std::string& user, std::string&
 			}
 		}
 
+		clientWindow->logLine("Connect: Getting door hexes in the pool.");
+		if (slotData.contains("door_hexes_in_the_pool")) {
+			for (int key : slotData["door_hexes_in_the_pool"]) {
+				doorsActuallyInTheItemPool.insert(key);
+			}
+		}
+
 		clientWindow->logLine("Connect: Getting item id to door hexes.");
 		if (slotData.contains("item_id_to_door_hexes")) {
 			for (auto& [key, val] : slotData["item_id_to_door_hexes"].items()) {
 				int itemId = std::stoul(key, nullptr, 10);
 				std::set<int> v = val;
 
 				itemIdToDoorSet.insert({ itemId, v });
-				
+
 				for (int door : v) {
-					doorToItemId.insert({ door, itemId });
+					if (doorsActuallyInTheItemPool.count(door)) {
+						doorToItemId.insert({ door, itemId });
+					}
 				}
 			}
 		}
 
-		clientWindow->logLine("Connect: Getting door hexes in the pool.");
-		if (slotData.contains("door_hexes_in_the_pool")) {
-			for (int key : slotData["door_hexes_in_the_pool"]) {
-				doorsActuallyInTheItemPool.insert(key);
-			}
-		}
-
 		clientWindow->logLine("Connect: Getting audio log hints.");
 		if (slotData.contains("log_ids_to_hints")) {
 			for (auto& [key, val] : slotData["log_ids_to_hints"].items()) {