morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

WebHost: Don't count exit saving as activity, thereby creating a hosting loop

Browse Source
This commit is contained in:
Fabian Dill
2020-07-20 14:17:05 +02:00
parent cb4d2d1ef0
commit ac238d9b14
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MultiServer.py
View File

@@ -150,7 +150,7 @@ class Context(Node):
return False
def _save(self) -> bool:
def _save(self, exit_save:bool=False) -> bool:
try:
jsonstr = json.dumps(self.get_save())
with open(self.save_filename, "wb") as f:
@@ -192,7 +192,7 @@ class Context(Node):
self.auto_saver_thread.start()
import atexit
atexit.register(self._save) # make sure we save on exit too
atexit.register(self._save, True) # make sure we save on exit too
def get_save(self) -> dict:
d = {
@@ -212,8 +212,9 @@ class Context(Node):
def set_save(self, savedata: dict):
rom_names = savedata["rom_names"] # convert from TrackerList to List in case of ponyorm
if rom_names != self.rom_names:
adjusted = {tuple(rom): (team, slot) for (rom, (team, slot)) in rom_names} # old format, ponyorm friendly
if {rom: other for rom, other in rom_names} != self.rom_names:
adjusted = {rom: (team, slot) for (rom, (team, slot)) in rom_names} # old format, ponyorm friendly
if self.rom_names != adjusted:
logging.warning('Save file mismatch, will start a new game')
return