From 8f68df2bd105f1f23f66545aacb6d739146f0c08 Mon Sep 17 00:00:00 2001 From: Christoffer Lantz Date: Sun, 28 Jul 2019 14:58:18 +0200 Subject: [PATCH 1/3] Tells the user which object was spawned --- server/src/cmd.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/src/cmd.rs b/server/src/cmd.rs index f43ed9bbe8..0b6161c0d5 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -555,7 +555,8 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: .create_object(pos, ori, obj_type) .with(ori);*/ if let (Some(pos), Some(ori)) = (pos, ori) { - let obj_type = match obj_type.as_ref().map(String::as_str) { + let obj_str_res = obj_type.as_ref().map(String::as_str); + let obj_type = match obj_str_res { Ok("scarecrow") => comp::object::Body::Scarecrow, Ok("cauldron") => comp::object::Body::Cauldron, Ok("chest_vines") => comp::object::Body::ChestVines, @@ -624,9 +625,10 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: .normalized(), )) .build(); - server - .clients - .notify(entity, ServerMsg::private(format!("Spawned object."))); + server.clients.notify( + entity, + ServerMsg::private(format!("Spawned object: {}", obj_str_res.unwrap())), + ); } else { server .clients From c154a41c5c06a5857aa8ac27ee00983cbf1f762f Mon Sep 17 00:00:00 2001 From: Christoffer Lantz Date: Sun, 28 Jul 2019 16:27:15 +0200 Subject: [PATCH 2/3] Changed Spawned object: to Spawned: in handle_object --- server/src/cmd.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 0b6161c0d5..f12c2070f5 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -627,7 +627,7 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: .build(); server.clients.notify( entity, - ServerMsg::private(format!("Spawned object: {}", obj_str_res.unwrap())), + ServerMsg::private(format!("Spawned: {}", obj_str_res.unwrap())), ); } else { server From 7dce9c4fb9ac641c9612ce3eba774411a1258cc1 Mon Sep 17 00:00:00 2001 From: Christoffer Lantz Date: Sun, 28 Jul 2019 20:32:13 +0200 Subject: [PATCH 3/3] Added unwrap_or to obj_str_opt in handle_object in case we don't return early in the _ => match arm --- server/src/cmd.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/cmd.rs b/server/src/cmd.rs index f12c2070f5..8edb5c6e69 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -627,7 +627,10 @@ fn handle_object(server: &mut Server, entity: EcsEntity, args: String, _action: .build(); server.clients.notify( entity, - ServerMsg::private(format!("Spawned: {}", obj_str_res.unwrap())), + ServerMsg::private(format!( + "Spawned: {}", + obj_str_res.unwrap_or("") + )), ); } else { server