update after merge from /main

2021-01-30 23:43:15 +01:00
parent 2553b1d2ee
commit 3d81f0cca7
15 changed files with 14 additions and 18 deletions
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1190,7 +1190,7 @@ class Spoiler(object):
            listed_locations.update(other_locations)

        self.shops = []
-        from Shops import ShopType
+        from worlds.alttp.Shops import ShopType
        for shop in self.world.shops:
            if not shop.custom:
                continue