fix: update for Dynamis (and dependencies)

This commit is contained in:
Anna 2022-11-04 23:32:40 -04:00
parent ce73a18374
commit 8a14952489
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
4 changed files with 409 additions and 290 deletions

680
server/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -20,7 +20,7 @@ rand = "0.8"
regex = "1"
reqwest = { version = "0.11", default-features = false }
rmp-serde = "1"
rustyline = { version = "9", default-features = false }
rustyline = { version = "10", default-features = false }
serde = { version = "1", features = ["derive"] }
serde_bytes = "0.11"
serde_repr = "0.1"

View File

@ -147,7 +147,14 @@ async fn main() -> Result<()> {
let (announce_tx, mut announce_rx) = tokio::sync::mpsc::channel(1);
std::thread::spawn(move || {
let mut editor = rustyline::Editor::<()>::new();
let mut editor = match rustyline::Editor::<()>::new() {
Ok(e) => e,
Err(e) => {
error!("error creating line editor: {:#?}", e);
return;
}
};
for line in editor.iter("> ") {
let line = match line {
Ok(l) => l,

View File

@ -172,6 +172,10 @@ pub fn id_from_world(world: World) -> u16 {
World::Phantom => 401,
World::Alpha => 402,
World::Raiden => 403,
World::Marilith => 404,
World::Seraph => 405,
World::Halicarnassus => 406,
World::Maduin => 407,
}
}
@ -254,6 +258,10 @@ pub fn world_from_id(id: u16) -> Option<World> {
401 => World::Phantom,
402 => World::Alpha,
403 => World::Raiden,
404 => World::Marilith,
405 => World::Seraph,
406 => World::Halicarnassus,
407 => World::Maduin,
_ => return None,
};