From 1fc2c5ed4b8590e1396fcb457e96a3493526f05e Mon Sep 17 00:00:00 2001 From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:25:33 -0400 Subject: [PATCH] Core: Getting rid of forfeit_mode (#3099) --- MultiServer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index 395577b663c5..b70f2deae624 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -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"] @@ -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