resolve test conflicts

Author: alwaysintreble

test/bases.py

@@ -89,15 +89,15 @@ def _get_items(self, item_pool, all_except):
             items = self.multiworld.itempool[:]
             items = [item for item in items if
                      item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
-            items.extend(ItemFactory(item_pool[0], 1))
+            items.extend(ItemFactory(item_pool[0], self.multiworld.worlds[1]))
         else:
-            items = ItemFactory(item_pool[0], 1)
+            items = ItemFactory(item_pool[0], self.multiworld.worlds[1])
         return self.get_state(items)
 
     def _get_items_partial(self, item_pool, missing_item):
         new_items = item_pool[0].copy()
         new_items.remove(missing_item)
-        items = ItemFactory(new_items, 1)
+        items = ItemFactory(new_items, self.multiworld.worlds[1])
         return self.get_state(items)
 
 

worlds/alttp/test/options/TestOpenPyramid.py

@@ -34,6 +34,6 @@ def testGanonGoalAccess(self):
         self.assertFalse(self.can_reach_entrance("Pyramid Hole"))
         self.collect_by_name(["Hammer", "Progressive Glove", "Moon Pearl"])
         self.assertFalse(self.can_reach_entrance("Pyramid Hole"))
-        self.multiworld.state.collect(ItemFactory("Beat Agahnim 2", self.world))
+        self.collect(ItemFactory("Beat Agahnim 2", self.multiworld.worlds[1]))
         self.assertTrue(self.can_reach_entrance("Pyramid Hole"))