diff --git a/src/bin/kawari-lobby.rs b/src/bin/kawari-lobby.rs index 4e1ba45..32c841f 100644 --- a/src/bin/kawari-lobby.rs +++ b/src/bin/kawari-lobby.rs @@ -78,16 +78,27 @@ async fn main() { let config = get_config(); - let body = reqwest::get(format!( + let Ok(login_reply) = reqwest::get(format!( "http://{}/_private/service_accounts?sid={}", config.login.get_socketaddr(), session_id )) .await - .unwrap() - .text() - .await - .unwrap(); + else { + tracing::warn!( + "Failed to contact login server, is it running?" + ); + connection.send_error(*sequence, 1012, 13101).await; + break; + }; + + let Ok(body) = login_reply.text().await else { + tracing::warn!( + "Failed to contact login server, is it running?" + ); + connection.send_error(*sequence, 1012, 13101).await; + break; + }; let service_accounts: Option> = serde_json::from_str(&body).ok(); diff --git a/src/world/lua.rs b/src/world/lua.rs index 32f6808..e9a239d 100644 --- a/src/world/lua.rs +++ b/src/world/lua.rs @@ -1,7 +1,10 @@ use mlua::{FromLua, Lua, LuaSerdeExt, UserData, UserDataFields, UserDataMethods, Value}; use crate::{ - common::{ObjectId, ObjectTypeId, Position, timestamp_secs, workdefinitions::RemakeMode, write_quantized_rotation}, + common::{ + ObjectId, ObjectTypeId, Position, timestamp_secs, workdefinitions::RemakeMode, + write_quantized_rotation, + }, ipc::zone::{ ActionEffect, DamageElement, DamageKind, DamageType, EffectKind, EventScene, ServerZoneIpcData, ServerZoneIpcSegment, Warp, @@ -157,12 +160,15 @@ impl UserData for LuaPlayer { Ok(()) }, ); - methods.add_method_mut("set_position", |lua, this, (position, rotation): (Value, Value)| { - let position: Position = lua.from_value(position).unwrap(); - let rotation: f32 = lua.from_value(rotation).unwrap(); - this.set_position(position, rotation); - Ok(()) - }); + methods.add_method_mut( + "set_position", + |lua, this, (position, rotation): (Value, Value)| { + let position: Position = lua.from_value(position).unwrap(); + let rotation: f32 = lua.from_value(rotation).unwrap(); + this.set_position(position, rotation); + Ok(()) + }, + ); methods.add_method_mut("change_territory", |_, this, zone_id: u16| { this.change_territory(zone_id); Ok(()) @@ -205,12 +211,8 @@ impl UserData for LuaPlayer { fields.add_field_method_get("teleport_query", |_, this| { Ok(this.player_data.teleport_query.clone()) }); - fields.add_field_method_get("rotation", |_, this| { - Ok(this.player_data.rotation) - }); - fields.add_field_method_get("position", |_, this| { - Ok(this.player_data.position) - }); + fields.add_field_method_get("rotation", |_, this| Ok(this.player_data.rotation)); + fields.add_field_method_get("position", |_, this| Ok(this.player_data.position)); } }