diff --git a/client/src/lib.rs b/client/src/lib.rs index 0762d8123f..4a3524dca2 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -845,7 +845,6 @@ impl Client { } pub fn edit_character(&mut self, alias: String, id: CharacterId, body: comp::Body) { - println!("Edit character"); self.character_list.loading = true; self.send_msg(ClientGeneral::EditCharacter { alias, id, body }); } diff --git a/server/src/character_creator.rs b/server/src/character_creator.rs index 610bd360d0..54a27cb808 100644 --- a/server/src/character_creator.rs +++ b/server/src/character_creator.rs @@ -82,10 +82,6 @@ pub fn edit_character( body: Body, character_updater: &mut WriteExpect<'_, CharacterUpdater>, ) -> Result<(), CreationError> { - // quick fix whitelist validation for now; eventually replace the - // `Option` with an index into a server-provided list of starter - // items, and replace `comp::body::Body` with `comp::body::humanoid::Body` - // throughout the messages involved if !matches!(body, Body::Humanoid(_)) { return Err(CreationError::InvalidBody); } diff --git a/server/src/persistence/character.rs b/server/src/persistence/character.rs index 1305a3f759..cf764b2ed3 100644 --- a/server/src/persistence/character.rs +++ b/server/src/persistence/character.rs @@ -516,6 +516,7 @@ pub fn edit_character( (body, char.body) { if new.species != old.species || new.body_type != old.body_type { + warn!("Should never happen due to client validation"); return Err(PersistenceError::CharacterDataError); } else { char.body = body; diff --git a/server/src/persistence/character_updater.rs b/server/src/persistence/character_updater.rs index 4b70b75fe2..2163ad093d 100644 --- a/server/src/persistence/character_updater.rs +++ b/server/src/persistence/character_updater.rs @@ -152,7 +152,7 @@ impl CharacterUpdater { error!(?e, "Could not send character edit response"); } else { debug!( - "Processed character create for player {}", + "Processed character edit for player {}", player_uuid ); } diff --git a/server/src/sys/msg/character_screen.rs b/server/src/sys/msg/character_screen.rs index 20c4a541b5..c0ac176f13 100644 --- a/server/src/sys/msg/character_screen.rs +++ b/server/src/sys/msg/character_screen.rs @@ -161,7 +161,7 @@ impl Sys { debug!( ?error, ?body, - "Denied creating character because of invalid input." + "Denied editing character because of invalid input." ); client.send(ServerGeneral::CharacterActionError(error.to_string()))?; }