From 8aafbf2865f8e7c7b75a43962e062d8695248b3c Mon Sep 17 00:00:00 2001
From: compiling <8335770+compiling@users.noreply.github.com>
Date: Thu, 16 Jan 2020 19:25:10 +1100
Subject: [PATCH] Fix skull woods pinball check

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

diff --git a/DoorShuffle.py b/DoorShuffle.py
index fce187e9..79cd225e 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -1113,7 +1113,7 @@ def determine_required_paths(world, player):
         'Turtle Rock': ['TR Boss'],
         'Ganons Tower': ['GT Agahnim 2']
         }
-    if world.shuffle == 'vanilla':
+    if world.shuffle[player] == 'vanilla':
         paths['Skull Woods'].insert(0, 'Skull 2 West Lobby')
         paths['Turtle Rock'].insert(0, 'TR Eye Bridge')
         paths['Turtle Rock'].insert(0, 'TR Big Chest Entrance')
@@ -1277,7 +1277,7 @@ def check_if_regions_visited(state, check_paths):
 
 def check_for_pinball_fix(state, bad_region, world, player):
     pinball_region = world.get_region('Skull Pinball', player)
-    if bad_region.name in ('Skull 2 West Lobby', 'Skull Boss') and state.visited_at_all(pinball_region):
+    if bad_region.name == 'Skull 2 West Lobby' and state.visited_at_all(pinball_region): #revisit this for entrance shuffle
         door = world.get_door('Skull Pinball WS', player)
         room = world.get_room(door.roomIndex, player)
         if room.doorList[door.doorListPos][1] == DoorKind.Trap: