From 90d506ee7c925a8d2025c344edb59ebb2b39829d Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 18 May 2022 14:54:13 +0200 Subject: [PATCH] Fill: fix type-crash on unfilled having either str or Location Fill: speed up Counter creation by skipping intermediary list creation --- Fill.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Fill.py b/Fill.py index cdb39b65..855f86ca 100644 --- a/Fill.py +++ b/Fill.py @@ -220,15 +220,15 @@ def distribute_items_restrictive(world: MultiWorld) -> None: restitempool, defaultlocations = fast_fill( world, restitempool, defaultlocations) unplaced = progitempool + restitempool - unfilled = [location.name for location in defaultlocations] + unfilled = defaultlocations if unplaced or unfilled: logging.warning( f'Unplaced items({len(unplaced)}): {unplaced} - Unfilled Locations({len(unfilled)}): {unfilled}') - items_counter = Counter([location.item.player for location in world.get_locations() if location.item]) - locations_counter = Counter([location.player for location in world.get_locations()]) - items_counter.update([item.player for item in unplaced]) - locations_counter.update([location.player for location in unfilled]) + items_counter = Counter(location.item.player for location in world.get_locations() if location.item) + locations_counter = Counter(location.player for location in world.get_locations()) + items_counter.update(item.player for item in unplaced) + locations_counter.update(location.player for location in unfilled) print_data = {"items": items_counter, "locations": locations_counter} logging.info(f'Per-Player counts: {print_data})')