From 13bac539d6c19b366be714c712c1acbcd4d1fb16 Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Tue, 19 Jul 2016 09:02:01 +0200 Subject: Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601) (cherry picked from commit d4e15f1aac3159bb5e17808ee06efb847fdd4789) # Conflicts: # src/server/game/Quests/QuestDef.cpp # src/server/game/Quests/QuestDef.h Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql (cherry picked from commit 3a77dec6e6fac47fedeb0aeddd09dfe12c3817a2) --- src/server/game/Entities/Player/Player.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/server/game/Entities/Player') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 08b4aac5fa0..1c07334c671 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15105,7 +15105,10 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, { /// @todo Poor design of mail system SQLTransaction trans = CharacterDatabase.BeginTransaction(); - MailDraft(mail_template_id).SendMailTo(trans, this, questGiver, MAIL_CHECK_MASK_HAS_BODY, quest->GetRewMailDelaySecs()); + if (quest->GetRewMailSenderEntry() != 0) + MailDraft(mail_template_id).SendMailTo(trans, this, quest->GetRewMailSenderEntry(), MAIL_CHECK_MASK_HAS_BODY, quest->GetRewMailDelaySecs()); + else + MailDraft(mail_template_id).SendMailTo(trans, this, questGiver, MAIL_CHECK_MASK_HAS_BODY, quest->GetRewMailDelaySecs()); CharacterDatabase.CommitTransaction(trans); } -- cgit v1.2.3