monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve option retrieval to fix test crashing

This commit is contained in:
espeon65536 2021-07-02 17:51:11 -05:00 committed by Fabian Dill
parent 576521229c
commit d9f97f6aad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/minecraft/__init__.py
View File

@ -33,7 +33,7 @@ class MinecraftWorld(World):
pool = [] pool = []
pool_counts = item_frequencies.copy() pool_counts = item_frequencies.copy()
if getattr(self.world, "bee_traps")[self.player]: if getattr(self.world, "bee_traps", {}).get(self.player, False):
pool_counts.update({"Rotten Flesh": 0, "Bee Trap (Minecraft)": 4}) pool_counts.update({"Rotten Flesh": 0, "Bee Trap (Minecraft)": 4})
for item_name, item_data in item_table.items(): for item_name, item_data in item_table.items():
for count in range(pool_counts.get(item_name, 1)): for count in range(pool_counts.get(item_name, 1)):
@ -43,7 +43,7 @@ class MinecraftWorld(World):
prefill_pool.update(events_table) prefill_pool.update(events_table)
exclusion_pools = ['hard', 'insane', 'postgame'] exclusion_pools = ['hard', 'insane', 'postgame']
for key in exclusion_pools: for key in exclusion_pools:
if not getattr(self.world, f"include_{key}_advancements")[self.player]: if not getattr(self.world, f"include_{key}_advancements", {}).get(self.player, False):
prefill_pool.update(exclusion_table[key]) prefill_pool.update(exclusion_table[key])
for loc_name, item_name in prefill_pool.items(): for loc_name, item_name in prefill_pool.items():