hopefully fix merge conflicts

ArchipelagoMW · Feb 10, 2024 · f0a210b · f0a210b
2 parents a1bd3ec + 59ef010
commit f0a210b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/worlds/kh2/Rules.py b/worlds/kh2/Rules.py
@@ -268,8 +268,7 @@ def set_kh2_rules(self) -> None:
                 add_item_rule(location, lambda item: item.player == self.player and item.name in DonaldAbility_Table.keys())
 
     def set_kh2_goal(self):
-
-        final_xemnas_location = self.multiworld.get_location(LocationName.FinalXemnas, self.player)
+        final_xemnas_location = self.multiworld.get_location(LocationName.FinalXemnasEventLocation, self.player)
         if self.world.options.Goal == "three_proofs":
             final_xemnas_location.access_rule = lambda state: self.kh2_has_all(three_proofs, state)
             if self.world.options.FinalXemnas:
@@ -291,8 +290,8 @@ def set_kh2_goal(self):
             else:
                 self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Bounty, self.player, self.world.options.BountyRequired.value)
         else:
-            final_xemnas_location.access_rule = lambda state: state.has(ItemName.Bounty, self.player, self.world.options.BountyRequired.value) and\
-                                  state.has(ItemName.LuckyEmblem, self.player, self.world.options.LuckyEmblemsRequired.value)
+            final_xemnas_location.access_rule = lambda state: state.has(ItemName.Bounty, self.player, self.world.options.BountyRequired.value) and \
+                                                              state.has(ItemName.LuckyEmblem, self.player, self.world.options.LuckyEmblemsRequired.value)
             if self.world.options.FinalXemnas:
                 self.multiworld.completion_condition[self.player] = lambda state: state.has(ItemName.Victory, self.player, 1)
             else: