monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small adjustments for game finished

This commit is contained in:
Fabian Dill 2020-04-25 13:50:32 +02:00
parent 49385ede3d
commit 49770159fb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MultiClient.py
View File

@ -666,7 +666,7 @@ async def process_server_cmd(ctx : Context, cmd, args):
logging.info('--------------------------------') logging.info('--------------------------------')
version = args.get("version", "unknown Bonta Protocol") version = args.get("version", "unknown Bonta Protocol")
if isinstance(version, list): if isinstance(version, list):
ctx.server_version = tuple(item for item in version) ctx.server_version = tuple(version)
version = ".".join(str(item) for item in version) version = ".".join(str(item) for item in version)
else: else:
ctx.server_version = (0, 0, 0) ctx.server_version = (0, 0, 0)
@ -1013,12 +1013,10 @@ async def game_watcher(ctx : Context):
if gameend[0]: if gameend[0]:
if not ctx.finished_game: if not ctx.finished_game:
try: try:
if ctx.server_version >= (2, 0, 5):
await send_msgs(ctx.socket, [['GameFinished', '']]) await send_msgs(ctx.socket, [['GameFinished', '']])
ctx.finished_game = True ctx.finished_game = True
except Exception as ex: except Exception as ex:
logging.exception(ex) logging.exception(ex)
pass
if time.perf_counter() - perf_counter < delay: if time.perf_counter() - perf_counter < delay:
continue continue
@ -1031,7 +1029,7 @@ async def game_watcher(ctx : Context):
else: else:
prev_game_timer = game_timer prev_game_timer = game_timer
if gamemode in ENDGAME_MODES: if gamemode in ENDGAME_MODES: # triforce room and credits
continue continue
data = await snes_read(ctx, RECV_PROGRESS_ADDR, 8) data = await snes_read(ctx, RECV_PROGRESS_ADDR, 8)