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

MultiServer: allow sending another Connect, to update tags, uuid, team etc.

This commit is contained in:
Fabian Dill 2021-10-25 06:57:06 +02:00
parent 375a0ff208
commit 4e3b8a5178
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MultiServer.py
View File

@ -1214,13 +1214,16 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
await ctx.send_msgs(client, [{"cmd": "ConnectionRefused", "errors": list(errors)}]) await ctx.send_msgs(client, [{"cmd": "ConnectionRefused", "errors": list(errors)}])
else: else:
team, slot = ctx.connect_names[args['name']] team, slot = ctx.connect_names[args['name']]
if client.auth and client.team is not None and client.slot in ctx.clients[client.team]:
ctx.clients[team][slot].remove(client) # re-auth, remove old entry
if client.team != team or client.slot != slot:
client.auth = False # swapping Team/Slot
client.team = team client.team = team
client.slot = slot client.slot = slot
minver = ctx.minimum_client_versions[slot] minver = ctx.minimum_client_versions[slot]
if minver > args['version']: if minver > args['version']:
errors.add('IncompatibleVersion') errors.add('IncompatibleVersion')
ctx.client_ids[client.team, client.slot] = args["uuid"] ctx.client_ids[client.team, client.slot] = args["uuid"]
client.auth = True
ctx.clients[team][slot].append(client) ctx.clients[team][slot].append(client)
client.version = args['version'] client.version = args['version']
client.tags = args['tags'] client.tags = args['tags']
@ -1236,9 +1239,12 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
if items: if items:
reply.append({"cmd": 'ReceivedItems', "index": 0, "items": items}) reply.append({"cmd": 'ReceivedItems', "index": 0, "items": items})
client.send_index = len(items) client.send_index = len(items)
if not client.auth: # if this was a Re-Connect, don't print to console
await on_client_joined(ctx, client)
else:
client.auth = True
await ctx.send_msgs(client, reply) await ctx.send_msgs(client, reply)
await on_client_joined(ctx, client)
elif cmd == "GetDataPackage": elif cmd == "GetDataPackage":
exclusions = set(args.get("exclusions", [])) exclusions = set(args.get("exclusions", []))

1
worlds/alttp/Options.py
View File

@ -1,5 +1,4 @@
import typing import typing
import random
from Options import Choice, Range, Option, Toggle, DefaultOnToggle from Options import Choice, Range, Option, Toggle, DefaultOnToggle