Merge 'Fix TypeError during debug logging in hint placement' (#2455)

Author: fenhl

CHANGELOG.md

@@ -16,6 +16,7 @@
 * For consistency with other location types, excluded pot/crate/beehive/wonderitem/etc. locations no longer behave as if their shuffle setting was off.
 * The Triforce Piece counter display has been moved to a CRT-safe position.
 * Fix Complete Mask Quest not working if Zelda's Letter is found in Kakariko.
+* Fix a bug where some custom hint distributions could cause the generator to fail with a `TypeError`.
 
 ## Other changes
 * Big poe souls can now be collected while riding Epona.

Hints.py

@@ -1650,7 +1650,10 @@ def build_world_gossip_hints(spoiler: Spoiler, world: World, checked_locations:
                 else:
                     logging.getLogger('').debug('Placed %s hint for %s.', hint_type, ', '.join([location.name for location in locations]))
             if not place_ok and custom_fixed:
-                logging.getLogger('').debug('Failed to place %s fixed hint for %s.', hint_type, ', '.join([location.name for location in locations]))
+                if locations is None:
+                    logging.getLogger('').debug('Failed to place %s fixed hint.', hint_type)
+                else:
+                    logging.getLogger('').debug('Failed to place %s fixed hint for %s.', hint_type, ', '.join([location.name for location in locations]))
                 fixed_hint_types.insert(0, hint_type)
 
 

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.3.34'
+__version__ = '8.3.35'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0