Revert "Merge branch 'pr/151'"

This reverts commit ffdaed9ea97bdc49d7d81f74f0c2e6462c6a9bdf, reversing
changes made to 1ea9197976b6f2ad2626fb453dc52acc787f9ddc.
This commit is contained in:
Edos512
2020-12-04 23:42:09 +01:00
parent bbd9c9a4f3
commit ce23369b0b
315 changed files with 70 additions and 398 deletions

View File

@@ -54,9 +54,8 @@ def fill_restrictive(world, base_state: CollectionState, locations, itempool, si
for location in region.locations:
if location.item and not location.event:
placements.append(location)
raise FillError(f'No more spots to place {item_to_place}, locations {locations} are invalid. '
f'Already placed {len(placements)}: {", ".join(str(place) for place in placements)}')
f'Already placed {len(placements)}: {", ".join(placements)}')
world.push_item(spot_to_fill, item_to_place, False)
locations.remove(spot_to_fill)