From f81335d614fdec431564062d9f71b4553a5c9355 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Sat, 31 Aug 2024 04:44:09 -0700 Subject: [PATCH] DS3: Don't return early in the location loop (#3856) This caused behavior errors when some locations in a group were excluded and others were not. --- worlds/dark_souls_3/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index c31a3681..f6e5cde6 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -1292,10 +1292,10 @@ class DarkSouls3World(World): locations = location if isinstance(location, list) else [location] for location in locations: data = location_dictionary[location] - if data.dlc and not self.options.enable_dlc: return - if data.ngp and not self.options.enable_ngp: return + if data.dlc and not self.options.enable_dlc: continue + if data.ngp and not self.options.enable_ngp: continue - if not self._is_location_available(location): return + if not self._is_location_available(location): continue if isinstance(rule, str): assert item_dictionary[rule].classification == ItemClassification.progression rule = lambda state, item=rule: state.has(item, self.player)