From 86a19249ab29c80f6264ffc9987faf027976276a Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Thu, 8 Jul 2021 00:58:58 +0200
Subject: [PATCH 1/2] Fix Swamp Portal check

---
 DoorShuffle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DoorShuffle.py b/DoorShuffle.py
index ee38f00c..94670e21 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -467,8 +467,8 @@ def choose_portals(world, player):
                 world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance)
 
     if not world.swamp_patch_required[player]:
-        swamp_region = world.get_entrance('Swamp Palace', player).connected_region
-        if swamp_region.name != 'Swamp Lobby':
+        swamp_portal = world.get_portal('Swamp', player)
+        if swamp_portal.door.name != 'Swamp Lobby S':
             world.swamp_patch_required[player] = True
 
 

From 2dd89197f3f2e29d262a23919ee38b555f9608fb Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Thu, 8 Jul 2021 01:09:30 +0200
Subject: [PATCH 2/2] Reset variable between attempts

---
 DoorShuffle.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DoorShuffle.py b/DoorShuffle.py
index 94670e21..588c2857 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -20,6 +20,7 @@ from KeyDoorShuffle import analyze_dungeon, validate_vanilla_key_logic, build_ke
 
 
 def link_doors(world, player):
+    orig_swamp_patch = world.swamp_patch_required[player]
     attempt, valid = 1, False
     while not valid:
         try:
@@ -43,6 +44,7 @@ def link_doors(world, player):
             reset_portals(world, player)
             reset_rooms(world, player)
             world.get_door("Skull Pinball WS", player).no_exit()
+            world.swamp_patch_required[player] = orig_swamp_patch
 
 
 def link_doors_main(world, player):