fixing the tests for bees again

Author: espeon65536

test/minecraft/TestMinecraft.py

@@ -5,6 +5,7 @@
 from worlds.minecraft import MinecraftWorld
 from worlds.minecraft.Items import MinecraftItem, item_table
 from worlds.minecraft.Options import AdvancementGoal, CombatDifficulty
+from Options import Toggle
 
 # Converts the name of an item into an item object
 def MCItemFactory(items, player: int):
@@ -33,8 +34,9 @@ def setUp(self):
         for pool in exclusion_pools:
             setattr(self.world, f"include_{pool}_advancements", [False, False])
         setattr(self.world, "advancement_goal", {1: AdvancementGoal(30)})
-        setattr(self.world, "shuffle_structures", {1: False})
+        setattr(self.world, "shuffle_structures", {1: Toggle(False)})
         setattr(self.world, "combat_difficulty", {1: CombatDifficulty(1)}) # normal
+        setattr(self.world, "bee_traps", {1: Toggle(False)})
         AutoWorld.call_single(self.world, "create_regions", 1)
         AutoWorld.call_single(self.world, "generate_basic", 1)
         AutoWorld.call_single(self.world, "set_rules", 1)

worlds/minecraft/__init__.py

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