Merge branch 'main' into breaking_changes

# Conflicts: # README.md
2021-03-13 23:34:38 +01:00
parent a528ed5e9e 28b2afe022
commit 6455dc3ffc
354 changed files with 354 additions and 142 deletions
--- a/worlds/alttp/Shops.py
+++ b/worlds/alttp/Shops.py
@@ -296,6 +296,7 @@ def create_shops(world, player: int):
                else:
                    loc.item = ItemFactory(GetBeemizerItem(world, player, 'Nothing'), player)
                    loc.shop_slot_disabled = True
+                loc.item.world = world
                shop.region.locations.append(loc)
                world.dynamic_locations.append(loc)
                world.clear_location_cache()