From 74273182139f3204b82c403bebbe8fede95773da Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:14:33 -0400 Subject: [PATCH] [Commands] Cleanup #copycharacter Command (#3479) # Notes - Cleanup messages and logic. --- zone/gm_commands/copycharacter.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/zone/gm_commands/copycharacter.cpp b/zone/gm_commands/copycharacter.cpp index 136093005..84af27677 100755 --- a/zone/gm_commands/copycharacter.cpp +++ b/zone/gm_commands/copycharacter.cpp @@ -2,26 +2,31 @@ void command_copycharacter(Client *c, const Seperator *sep) { - if (sep->argnum < 3) { + if ( + sep->argnum < 3 || + sep->IsNumber(1) || + sep->IsNumber(2) || + sep->IsNumber(3) + ) { c->Message( Chat::White, - "Usage: [source_character_name] [destination_character_name] [destination_account_name]" + "Usage: #copycharacter [source_character_name] [destination_character_name] [destination_account_name]" ); return; } - std::string source_character_name = sep->arg[1]; - std::string destination_character_name = sep->arg[2]; - std::string destination_account_name = sep->arg[3]; + const std::string& source_character_name = sep->arg[1]; + const std::string& destination_character_name = sep->arg[2]; + const std::string& destination_account_name = sep->arg[3]; - bool result = database.CopyCharacter( + const bool result = database.CopyCharacter( source_character_name, destination_character_name, destination_account_name ); c->Message( - Chat::Yellow, + Chat::White, fmt::format( "Character Copy [{}] to [{}] via account [{}] [{}]", source_character_name,