From e242f1b7ccc9f439abd577ab78427673c86e7bb5 Mon Sep 17 00:00:00 2001
From: Elmsroth <elmsroth@eskwad.net>
Date: Wed, 30 Dec 2020 17:54:00 +0100
Subject: [PATCH] Fix .ticket surveyclose (#125)

---
 src/game/ChatCommands/GMTicketCommands.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/game/ChatCommands/GMTicketCommands.cpp b/src/game/ChatCommands/GMTicketCommands.cpp
index a4fd62bb..2138a8a7 100644
--- a/src/game/ChatCommands/GMTicketCommands.cpp
+++ b/src/game/ChatCommands/GMTicketCommands.cpp
@@ -545,7 +545,8 @@ bool ChatHandler::HandleTicketShowCommand(char* args)
 bool ChatHandler::HandleTickerSurveyClose(char* args)
 {
     GMTicket* ticket = NULL;
-
+    std::string target_name;
+    ObjectGuid target_guid;
     uint32 num;
     if (ExtractUInt32(&args, num))
     {
@@ -565,8 +566,7 @@ bool ChatHandler::HandleTickerSurveyClose(char* args)
     }
     else
     {
-        ObjectGuid target_guid;
-        std::string target_name;
+
         if (!ExtractPlayerTarget(&args, NULL, &target_guid, &target_name))
         {
             return false;
@@ -582,7 +582,8 @@ bool ChatHandler::HandleTickerSurveyClose(char* args)
             return false;
         }
     }
-
+    
+    uint32 ticketId = ticket->GetId();
     ticket->CloseWithSurvey();
 
     //This needs to be before we delete the ticket
@@ -599,7 +600,9 @@ bool ChatHandler::HandleTickerSurveyClose(char* args)
     sTicketMgr.Delete(ticket->GetPlayerGuid());
     ticket = NULL;
 
-    PSendSysMessage(LANG_COMMAND_TICKETCLOSED_NAME, pPlayer->GetName());
+    const char* gmNameReplacementWhenUsingCLI = "ADMIN";
+
+    PSendSysMessage(LANG_COMMAND_TICKETCLOSED_NAME, ticketId, target_name.c_str(), m_session ? m_session->GetPlayer()->GetName() : gmNameReplacementWhenUsingCLI);
 
     return true;
 }
\ No newline at end of file