diff options
Diffstat (limited to 'network/login_server.gd')
| -rw-r--r-- | network/login_server.gd | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/network/login_server.gd b/network/login_server.gd index 902c477..b2e6e1b 100644 --- a/network/login_server.gd +++ b/network/login_server.gd @@ -2,8 +2,8 @@ class_name LoginServer extends Server -signal logged_in(packet: LoginServerLoginSuccessPacket) -signal login_failed(packet: LoginFailedPacket) +#signal logged_in(packet: LoginServerLoginSuccessPacket) +#signal login_failed(packet: LoginFailedPacket) @warning_ignore("shadowed_variable_base_class") @@ -11,20 +11,18 @@ func _init(host: String, port: int = 6900) -> void: super._init(host, port) -func login(username: String, password: String): +func login(username: String, password: String) -> Packet: var login_server_login_packet = LoginServerLoginPacket.new() login_server_login_packet.username = username login_server_login_packet.password = password send(login_server_login_packet) - var packet = await received_packet - if packet is LoginServerLoginSuccessPacket: - logged_in.emit(packet) - elif packet is LoginFailedPacket: - login_failed.emit(packet) - - return packet + return await wait_for_packets([ + LoginServerLoginSuccessPacket, + LoginFailedPacket, + LoginFailedPacket2, + ]) func get_keep_alive_timer() -> Timer: @@ -32,7 +30,7 @@ func get_keep_alive_timer() -> Timer: login_server_keep_alive_timer.name = "LoginServerKeepAliveTimer" login_server_keep_alive_timer.autostart = true login_server_keep_alive_timer.one_shot = false - login_server_keep_alive_timer.wait_time = 30.0 # 60.0 + login_server_keep_alive_timer.wait_time = 20.0 # 30.0 # 60.0 login_server_keep_alive_timer.timeout.connect(func(): var login_server_keep_alive_packet := LoginServerKeepAlivePacket.new() |