diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-08-26 12:40:41 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-08-26 12:40:41 +0100 |
| commit | b2134dbbe300f6b0ff55d551295a56a67748056f (patch) | |
| tree | abb884bc3a0a3aca903efd789687eeac59363a0f /src/server/game/Chat/Chat.cpp | |
| parent | d9a136fd58ff09cf6e3020c5b06035ac772fc1f3 (diff) | |
| parent | 8eaf7632355cfabdc919c7b42953c8c72f1f8015 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 55440650993..e8b4c91b2cd 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -342,7 +342,7 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand* table, const char* text, co { if (!ExecuteCommandInTable(table[i].ChildCommands, text, fullcmd)) { - if (text && text[0] != '\0') + if (text[0] != '\0') SendSysMessage(LANG_NO_SUBCMD); else SendSysMessage(LANG_CMD_SYNTAX); |