nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core/Commands: Add missing message for .ticket complete (#79)

Browse Source 
Do not allow the completion of a ticket with or without response if the handler isn't the assignee
Let players know when their ticket has been closed or they received a response.
This commit is contained in:
Luth31
2016-08-14 20:45:13 +03:00
committed by Shin
parent e2daeebd98
commit 47dfb6c526
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/sql/updates/world/2016_08_13_01.sql Normal file
View File

@@ -0,0 +1,3 @@
INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
(1334, 'Your ticket has been closed.'),
(1335, 'You received a ticket response.');

6
src/game/Miscellaneous/Language.h
View File

@@ -1045,7 +1045,11 @@ enum TrinityStrings
LANG_BG_AV_H_CAPTAIN_DEAD = 1331,
LANG_BG_AV_A_CAPTAIN_DEAD = 1332,
LANG_BG_AV_START_TWO_MINUTES = 1333,
// FREE IDS 1334-1999
//Player Ticket Strings
LANG_TICKET_CLOSED = 1334,
LANG_TICKET_COMPLETED = 1335,
// FREE IDS 1336-1999
// Ticket Strings 2000-2030
LANG_COMMAND_TICKETNEW = 2000,

31
src/scripts/Commands/cs_ticket.cpp
View File

@@ -168,6 +168,7 @@ public:
WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
submitter->GetSession()->SendPacket(&data);
ChatHandler(submitter->GetSession()).SendSysMessage(LANG_TICKET_CLOSED);
}
return true;
}
@@ -233,25 +234,29 @@ public:
return true;
}
char* response = strtok(NULL, "\n");
if (response)
// Check if handler is not assignee in which case return
Player* player = handler->GetSession() ? handler->GetSession()->GetPlayer() : NULL;
if (player && ticket->IsAssignedNotTo(player->GetGUID()))
{
// Cannot add response to ticket, assigned to someone else
//! Console excluded
Player* player = handler->GetSession() ? handler->GetSession()->GetPlayer() : NULL;
if (player && ticket->IsAssignedNotTo(player->GetGUID()))
{
handler->PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->GetId());
return true;
}
ticket->AppendResponse(response);
handler->PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->GetId());
return true;
}
if (Player* player = ticket->GetPlayer())
ticket->SendResponse(player->GetSession());
char* response = strtok(NULL, "\n");
if (response)
ticket->AppendResponse(response);
if (Player* player = ticket->GetPlayer())
{
ticket->SendResponse(player->GetSession());
ChatHandler(player->GetSession()).SendSysMessage(LANG_TICKET_COMPLETED);
}
Player* gm = handler->GetSession() ? handler->GetSession()->GetPlayer() : NULL;
std::string msg = ticket->FormatMessageString(*handler, NULL, NULL, NULL, NULL);
msg += handler->PGetParseString(LANG_COMMAND_TICKETCOMPLETED, gm ? gm->GetName().c_str() : "Console");
handler->SendGlobalGMSysMessage(msg.c_str());
SQLTransaction trans = SQLTransaction(NULL);
ticket->SetCompleted();