aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp107
1 files changed, 36 insertions, 71 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index e5613cbb703..d0b1a25f192 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -2566,6 +2566,9 @@ void Player::GiveLevel(uint8 level)
if (Pet* pet = GetPet())
pet->SynchronizeLevelWithOwner();
+ if (MailLevelReward const* mailReward = objmgr.GetMailLevelReward(level,getRaceMask()))
+ MailDraft(mailReward->mailTemplateId).SendMailTo(this,MailSender(MAIL_CREATURE,mailReward->senderEntry));
+
GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL);
}
@@ -4131,8 +4134,8 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
// remove signs from petitions (also remove petitions if owner);
RemovePetitionsAndSigns(playerguid, 10);
- // return back all mails with COD and Item 0 1 2 3 4 5 6
- QueryResult *resultMail = CharacterDatabase.PQuery("SELECT id,mailTemplateId,sender,subject,itemTextId,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", guid);
+ // return back all mails with COD and Item 0 1 2 3 4 5 6 7
+ QueryResult *resultMail = CharacterDatabase.PQuery("SELECT id,messageType,mailTemplateId,sender,subject,itemTextId,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", guid);
if(resultMail)
{
do
@@ -4140,18 +4143,30 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
Field *fields = resultMail->Fetch();
uint32 mail_id = fields[0].GetUInt32();
- uint16 mailTemplateId= fields[1].GetUInt16();
- uint32 sender = fields[2].GetUInt32();
- std::string subject = fields[3].GetCppString();
- uint32 itemTextId = fields[4].GetUInt32();
- uint32 money = fields[5].GetUInt32();
- bool has_items = fields[6].GetBool();
+ uint16 mailType = fields[1].GetUInt16();
+ uint16 mailTemplateId= fields[2].GetUInt16();
+ uint32 sender = fields[3].GetUInt32();
+ std::string subject = fields[4].GetCppString();
+ uint32 itemTextId = fields[5].GetUInt32();
+ uint32 money = fields[6].GetUInt32();
+ bool has_items = fields[7].GetBool();
//we can return mail now
//so firstly delete the old one
CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", mail_id);
- MailItemsInfo mi;
+ // mail not from player
+ if (mailType != MAIL_NORMAL)
+ {
+ if(has_items)
+ CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id);
+ continue;
+ }
+
+ MailDraft draft(subject, itemTextId);
+ if (mailTemplateId)
+ draft = MailDraft(mailTemplateId,false); // itesm already included
+
if(has_items)
{
// data needs to be at first place for Item::LoadFromDB
@@ -4180,7 +4195,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
continue;
}
- mi.AddItem(item_guidlow, item_template, pItem);
+ draft.AddItem(pItem);
}
while (resultItems->NextRow());
@@ -4192,7 +4207,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
uint32 pl_account = objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
- WorldSession::SendReturnToSender(MAIL_NORMAL, pl_account, guid, sender, subject, itemTextId, &mi, money, mailTemplateId);
+ draft.AddMoney(money).SendReturnToSender(pl_account, guid, sender);
}
while (resultMail->NextRow());
@@ -7853,7 +7868,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
{
sLog.outDebug(" if(lootid)");
loot->clear();
- loot->FillLoot(lootid, LootTemplates_Gameobject, this, false, go->GetLootMode());
+ loot->FillLoot(lootid, LootTemplates_Gameobject, this, false, false, go->GetLootMode());
}
if (loot_type == LOOT_FISHING)
@@ -7982,7 +7997,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
loot->clear();
if (uint32 lootid = creature->GetCreatureInfo()->lootid)
- loot->FillLoot(lootid, LootTemplates_Creature, recipient, false, creature->GetLootMode());
+ loot->FillLoot(lootid, LootTemplates_Creature, recipient, false, false, creature->GetLootMode());
loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold);
@@ -13267,56 +13282,8 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
}
// Send reward mail
- if (pQuest->GetRewMailTemplateId())
- {
- MailMessageType mailType;
- uint32 senderGuidOrEntry;
- switch(questGiver->GetTypeId())
- {
- case TYPEID_UNIT:
- mailType = MAIL_CREATURE;
- senderGuidOrEntry = questGiver->GetEntry();
- break;
- case TYPEID_GAMEOBJECT:
- mailType = MAIL_GAMEOBJECT;
- senderGuidOrEntry = questGiver->GetEntry();
- break;
- case TYPEID_ITEM:
- mailType = MAIL_ITEM;
- senderGuidOrEntry = questGiver->GetEntry();
- break;
- case TYPEID_PLAYER:
- mailType = MAIL_NORMAL;
- senderGuidOrEntry = questGiver->GetGUIDLow();
- break;
- default:
- mailType = MAIL_NORMAL;
- senderGuidOrEntry = GetGUIDLow();
- break;
- }
-
- Loot questMailLoot;
-
- questMailLoot.FillLoot(pQuest->GetQuestId(), LootTemplates_QuestMail, this,true);
-
- // fill mail
- MailItemsInfo mi; // item list preparing
-
- uint32 max_slot = questMailLoot.GetMaxSlotInLootFor(this);
- for (uint32 i = 0; mi.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
- {
- if (LootItem* lootitem = questMailLoot.LootItemInSlot(i,this))
- {
- if (Item* item = Item::CreateItem(lootitem->itemid,lootitem->count,this))
- {
- item->SaveToDB(); // save for prevent lost at next mail load, if send fail then item will deleted
- mi.AddItem(item->GetGUIDLow(), item->GetEntry(), item);
- }
- }
- }
-
- WorldSession::SendMailTo(this, mailType, MAIL_STATIONERY_NORMAL, senderGuidOrEntry, GetGUIDLow(), "", 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE,pQuest->GetRewMailDelaySecs(),pQuest->GetRewMailTemplateId());
- }
+ if (uint32 mail_template_id = pQuest->GetRewMailTemplateId())
+ MailDraft(mail_template_id).SendMailTo(this, questGiver, MAIL_CHECK_MASK_NONE, pQuest->GetRewMailDelaySecs());
if (pQuest->IsDaily())
{
@@ -15641,20 +15608,20 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
// send by mail problematic items
while (!problematicItems.empty())
{
+ std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM);
+
// fill mail
- MailItemsInfo mi; // item list preparing
+ MailDraft draft(subject);
for (uint8 i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i)
{
Item* item = problematicItems.front();
problematicItems.pop_front();
- mi.AddItem(item->GetGUIDLow(), item->GetEntry(), item);
+ draft.AddItem(item);
}
- std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM);
-
- WorldSession::SendMailTo(this, MAIL_NORMAL, MAIL_STATIONERY_GM, GetGUIDLow(), GetGUIDLow(), subject, 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
+ draft.SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM));
}
}
//if(isAlive())
@@ -20026,8 +19993,6 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/)
}
else
{
- MailItemsInfo mi;
- mi.AddItem(offItem->GetGUIDLow(), offItem->GetEntry(), offItem);
MoveItemFromInventory(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND, true);
CharacterDatabase.BeginTransaction();
offItem->DeleteFromInventoryDB(); // deletes item from character's inventory
@@ -20035,7 +20000,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/)
CharacterDatabase.CommitTransaction();
std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM);
- WorldSession::SendMailTo(this, MAIL_NORMAL, MAIL_STATIONERY_GM, GetGUIDLow(), GetGUIDLow(), subject, 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
+ MailDraft(subject).AddItem(offItem).SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM));
}
}