LttP: fix Ganon's Tower trash prefill ignoring item_rules (#648)

ArchipelagoMW · Jun 17, 2022 · 05a5134 · 05a5134
1 parent 6c525e1
commit 05a5134
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
@@ -472,13 +472,14 @@ def stage_fill_hook(cls, world, progitempool, nonexcludeditempool, localrestitem
                 while gtower_locations and gt_item_pool and trash_count > 0:
                     spot_to_fill = gtower_locations.pop()
                     item_to_place = gt_item_pool.pop()
-                    if item_to_place in localrest:
-                        localrest.remove(item_to_place)
-                    else:
-                        restitempool.remove(item_to_place)
-                    world.push_item(spot_to_fill, item_to_place, False)
-                    fill_locations.remove(spot_to_fill)  # very slow, unfortunately
-                    trash_count -= 1
+                    if spot_to_fill.item_rule(item_to_place):
+                        if item_to_place in localrest:
+                            localrest.remove(item_to_place)
+                        else:
+                            restitempool.remove(item_to_place)
+                        world.push_item(spot_to_fill, item_to_place, False)
+                        fill_locations.remove(spot_to_fill)  # very slow, unfortunately
+                        trash_count -= 1
 
 
     def get_filler_item_name(self) -> str: