Merge pull request #3392 from Bizzy/Bizzy

Core/Commands: Added '.ticket reset' for resetting ticket-id counter. Aut

3 files changed, 18 insertions, 0 deletions

diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index cd62d93c242..8d03530c7f9 100755
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -318,6 +318,7 @@ ChatCommand* ChatHandler::getCommandTable()
         { "closedlist",     SEC_MODERATOR,      false, OldHandler<&ChatHandler::HandleGMTicketListClosedCommand>,       "", NULL },
         { "escalatedlist",  SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleGMTicketListEscalatedCommand>,    "", NULL },
         { "delete",         SEC_ADMINISTRATOR,  false, OldHandler<&ChatHandler::HandleGMTicketDeleteByIdCommand>,       "", NULL },
+        { "reset",          SEC_ADMINISTRATOR,  false, OldHandler<&ChatHandler::HandleGMTicketResetCommand>,            "", NULL },
         { "assign",         SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleGMTicketAssignToCommand>,         "", NULL },
         { "unassign",       SEC_GAMEMASTER,     false, OldHandler<&ChatHandler::HandleGMTicketUnAssignCommand>,         "", NULL },
         { "comment",        SEC_MODERATOR,      false, OldHandler<&ChatHandler::HandleGMTicketCommentCommand>,          "", NULL },
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index b33a4944e6b..6e34e39af5a 100755
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -317,6 +317,7 @@ class ChatHandler
         bool HandleGMTicketUnAssignCommand(const char* args);
         bool HandleGMTicketCommentCommand(const char* args);
         bool HandleGMTicketDeleteByIdCommand(const char* args);
+        bool HandleGMTicketResetCommand(const char* /* args */);
         bool HandleGMTicketReloadCommand(const char*);
         bool HandleToggleGMTicketSystem(const char* args);
         bool HandleGMTicketEscalateCommand(const char* args);
diff --git a/src/server/game/Chat/Commands/TicketCommands.cpp b/src/server/game/Chat/Commands/TicketCommands.cpp
index 2ae4632d172..7caf63aac2b 100755
--- a/src/server/game/Chat/Commands/TicketCommands.cpp
+++ b/src/server/game/Chat/Commands/TicketCommands.cpp
@@ -320,6 +320,22 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
     return true;
 }
 
+bool ChatHandler::HandleGMTicketResetCommand(const char* /* args */)
+{
+    if (sTicketMgr->GetOpenTicketCount() > 0)
+    {
+        SendSysMessage(LANG_COMMAND_TICKETPENDING);
+        return true;
+    }
+    else
+    {
+        sTicketMgr->ResetTickets();
+        SendSysMessage(LANG_COMMAND_TICKETRESET);
+    }
+
+    return true;
+}
+
 bool ChatHandler::HandleToggleGMTicketSystem(const char* /* args */)
 {
     bool status = !sTicketMgr->GetStatus();