diff options
| -rw-r--r-- | sql/updates/world/master/2022_02_28_19_world_2020_10_08_00_world.sql | 6 | ||||
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommand.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/sql/updates/world/master/2022_02_28_19_world_2020_10_08_00_world.sql b/sql/updates/world/master/2022_02_28_19_world_2020_10_08_00_world.sql new file mode 100644 index 00000000000..2208e456128 --- /dev/null +++ b/sql/updates/world/master/2022_02_28_19_world_2020_10_08_00_world.sql @@ -0,0 +1,6 @@ +-- +DELETE FROM `trinity_string` WHERE `entry`=196; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(196, 'There is no detailed usage information associated with \'%.*s\'. +This should never occur for stock TrinityCore commands - if it does, report this as a bug. +If this is a custom command, use `trinity_string` to specify it. Look at cs_achievement.cpp for example usage.'); diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp index 6d1ac20930a..d9c56042ef1 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp @@ -173,8 +173,13 @@ void Trinity::Impl::ChatCommands::ChatCommandNode::SendCommandHelp(ChatHandler& { if (std::holds_alternative<TrinityStrings>(_help)) handler.SendSysMessage(std::get<TrinityStrings>(_help)); - else + else if (std::holds_alternative<std::string>(_help)) handler.SendSysMessage(std::get<std::string>(_help)); + else + { + handler.PSendSysMessage(LANG_CMD_HELP_GENERIC, STRING_VIEW_FMT_ARG(_name)); + handler.PSendSysMessage(LANG_CMD_NO_HELP_AVAILABLE, STRING_VIEW_FMT_ARG(_name)); + } } bool header = false; diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 993fff7aa79..117a6cc2e29 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -237,7 +237,7 @@ enum TrinityStrings LANG_SUBCMD_INVALID = 193, LANG_CMD_AMBIGUOUS = 194, LANG_CMD_HELP_GENERIC = 195, - LANG_CMD_NO_HELP_AVAILABLE = 196, // 3.3.5 RESERVED + LANG_CMD_NO_HELP_AVAILABLE = 196, // Room for more level 1 197-199 not used // level 2 chat |