Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2026-10-17 05:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly handle vanilla activation error (#118)

Browse Source
This commit is contained in:
JeffTheRock
2026-10-16 03:55:05 -04:00
committed by GitHub
parent d923aa1115
commit 36eaa5cbd3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
houdini/handlers/login/login.py
View File

@@ -67,7 +67,7 @@ async def handle_login(p, credentials: Credentials):
preactivation_expiry = data.registration_date + timedelta(days=p.server.config.preactivation_days)
preactivation_expiry = preactivation_expiry - datetime.now()
preactivation_hours = preactivation_expiry.total_seconds() // 3600
if preactivation_hours <= 0 or p.client_type == ClientType.Legacy:
if p.client_type == ClientType.Legacy:
return await p.send_error_and_disconnect(900)
if data.permaban:
@@ -111,8 +111,11 @@ async def handle_login(p, credentials: Credentials):
if p.client_type == ClientType.Vanilla:
raw_login_data = f'{data.id}|{data.id}|{data.username}|{login_key}|houdini|{data.approval}|{data.rejection}'
if not data.active:
await p.send_xt('l', raw_login_data, confirmation_hash, '', world_populations, buddy_presence,
data.email, int(preactivation_hours))
if preactivation_hours <= 0:
await p.send_xt('loginMustActivate', 0, confirmation_hash, raw_login_data, data.email)
else:
await p.send_xt('l', raw_login_data, confirmation_hash, '', world_populations, buddy_presence,
data.email, int(preactivation_hours))
else:
await p.send_xt('l', raw_login_data, confirmation_hash, '', world_populations, buddy_presence, data.email)
else: