no longer try patching if it's the wrong rom.
People ignore the warning.
This commit is contained in:
parent
f583db3ee9
commit
611f4d3fb2
|
@ -747,7 +747,7 @@ async def server_auth(ctx: Context, password_requested):
|
|||
ctx.awaiting_rom = False
|
||||
ctx.auth = ctx.rom.copy()
|
||||
await send_msgs(ctx.socket, [['Connect', {
|
||||
'password': ctx.password, 'rom': ctx.auth, 'version': [1, 1, 0], 'tags': ['Berserker']
|
||||
'password': ctx.password, 'rom': ctx.auth, 'version': [1, 2, 0], 'tags': ['Berserker']
|
||||
}]])
|
||||
|
||||
async def console_input(ctx : Context):
|
||||
|
|
|
@ -170,7 +170,9 @@ async def on_client_disconnected(ctx: Context, client: Client):
|
|||
await on_client_left(ctx, client)
|
||||
|
||||
async def on_client_joined(ctx: Context, client: Client):
|
||||
notify_all(ctx, "%s (Team #%d) has joined the game" % (client.name, client.team + 1))
|
||||
notify_all(ctx, "%s (Team #%d) has joined the game. Client(%s, %s)." % (client.name, client.team + 1,
|
||||
".".join(str(x) for x in client.version),
|
||||
client.tags))
|
||||
|
||||
async def on_client_left(ctx: Context, client: Client):
|
||||
notify_all(ctx, "%s (Team #%d) has left the game" % (client.name, client.team + 1))
|
||||
|
|
4
Patch.py
4
Patch.py
|
@ -22,8 +22,8 @@ def get_base_rom_bytes() -> bytes:
|
|||
basemd5 = hashlib.md5()
|
||||
basemd5.update(base_rom_bytes)
|
||||
if JAP10HASH != basemd5.hexdigest():
|
||||
logging.warning('Supplied Base Rom does not match known MD5 for JAP(1.0) release.'
|
||||
' Will try to patch anyway.')
|
||||
raise Exception('Supplied Base Rom does not match known MD5 for JAP(1.0) release. '
|
||||
'Get the correct game and version, then dump it')
|
||||
return base_rom_bytes
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue