Skip to content

Commit

Permalink
Core: Getting rid of forfeit_mode (ArchipelagoMW#3099)
Browse files Browse the repository at this point in the history
  • Loading branch information
Exempt-Medic authored Apr 12, 2024
1 parent 242126b commit 1fc2c5e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions MultiServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ def set_save(self, savedata: dict):
self.location_check_points = savedata["game_options"]["location_check_points"]
self.server_password = savedata["game_options"]["server_password"]
self.password = savedata["game_options"]["password"]
self.release_mode = savedata["game_options"].get("release_mode", savedata["game_options"].get("forfeit_mode", "goal"))
self.release_mode = savedata["game_options"]["release_mode"]
self.remaining_mode = savedata["game_options"]["remaining_mode"]
self.collect_mode = savedata["game_options"]["collect_mode"]
self.item_cheat = savedata["game_options"]["item_cheat"]
Expand Down Expand Up @@ -631,8 +631,6 @@ def slot_set(self, slot) -> typing.Set[int]:

def _set_options(self, server_options: dict):
for key, value in server_options.items():
if key == "forfeit_mode":
key = "release_mode"
data_type = self.simple_options.get(key, None)
if data_type is not None:
if value not in {False, True, None}: # some can be boolean OR text, such as password
Expand Down

0 comments on commit 1fc2c5e

Please sign in to comment.