ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Commands): partially fix an issue with mails sent from console never showing up the 'Customer Support' sender in-game (#8064)

Browse source
This commit is contained in:
Skjalf 2021-10-04 10:44:04 -03:00 • committed by GitHub
parent 085fc0a1a7
commit c55c5e668f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/scripts/Commands/cs_misc.cpp
View file

@ -2691,8 +2691,10 @@ public:
std::string subject = msgSubject;
std::string text = msgText;
// from console show not existed sender
MailSender sender(MAIL_NORMAL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetGUID().GetCounter() : 0, MAIL_STATIONERY_GM);
ObjectGuid::LowType senderGuid;
// If the message is sent from console, set it as sent by the target itself, like the other Customer Support mails.
senderGuid = handler->GetSession() ? handler->GetSession()->GetPlayer()->GetGUID().GetCounter() : targetGuid.GetCounter();
MailSender sender(MAIL_NORMAL, senderGuid, MAIL_STATIONERY_GM);
//- TODO: Fix poor design
CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
@ -2789,8 +2791,10 @@ public:
}
}
// from console show not existed sender
MailSender sender(MAIL_NORMAL, handler->GetSession() ? handler->GetSession()->GetPlayer()->GetGUID().GetCounter() : 0, MAIL_STATIONERY_GM);
ObjectGuid::LowType senderGuid;
// If the message is sent from console, set it as sent by the target itself, like the other Customer Support mails.
senderGuid = handler->GetSession() ? handler->GetSession()->GetPlayer()->GetGUID().GetCounter() : receiverGuid.GetCounter();
MailSender sender(MAIL_NORMAL, senderGuid, MAIL_STATIONERY_GM);
// fill mail
MailDraft draft(subject, text);