Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlefield/Battlefield.h src/server/game/Battlegrounds/ArenaScore.h src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Battlegrounds/ArenaTeam.h src/server/game/Battlegrounds/ArenaTeamMgr.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Battlegrounds/BattlegroundMgr.h src/server/game/Battlegrounds/BattlegroundQueue.h src/server/game/Battlegrounds/BattlegroundScore.h src/server/game/Battlegrounds/Zones/BattlegroundAB.h src/server/game/Battlegrounds/Zones/BattlegroundAV.h src/server/game/Battlegrounds/Zones/BattlegroundEY.h src/server/game/Battlegrounds/Zones/BattlegroundIC.h src/server/game/Battlegrounds/Zones/BattlegroundSA.h src/server/game/Battlegrounds/Zones/BattlegroundWS.h src/server/game/DungeonFinding/LFG.h src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/DungeonFinding/LFGMgr.h src/server/game/DungeonFinding/LFGQueue.cpp src/server/game/DungeonFinding/LFGQueue.h src/server/game/Entities/Corpse/Corpse.cpp src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Creature/GossipDef.cpp src/server/game/Entities/Creature/GossipDef.h src/server/game/Entities/Creature/TemporarySummon.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Object.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Globals/ObjectAccessor.cpp src/server/game/Globals/ObjectAccessor.h src/server/game/Globals/ObjectMgr.cpp src/server/game/Groups/Group.cpp src/server/game/Groups/Group.h src/server/game/Guilds/Guild.cpp src/server/game/Guilds/Guild.h src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/CalendarHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/NPCHandler.cpp src/server/game/Handlers/PetHandler.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Handlers/VehicleHandler.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/Commands/cs_gm.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Commands/cs_reset.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Kalimdor/zone_moonglade.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_ungoro_crater.cpp src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_generic.cpp src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
commit
8e288dd673
597 files changed
+9276
-9366
No files matched your search
@@ -31,7 +31,7 @@
|
||||
#include "BattlenetAccountMgr.h"
|
||||
#include "GuildMgr.h"
|
||||
|
||||
bool WorldSession::CanOpenMailBox(uint64 guid)
|
||||
bool WorldSession::CanOpenMailBox(ObjectGuid guid)
|
||||
{
|
||||
if (guid == _player->GetGUID())
|
||||
{
|
||||
@@ -41,12 +41,12 @@ bool WorldSession::CanOpenMailBox(uint64 guid)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (IS_GAMEOBJECT_GUID(guid))
|
||||
else if (guid.IsGameObject())
|
||||
{
|
||||
if (!_player->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_MAILBOX))
|
||||
return false;
|
||||
}
|
||||
else if (IS_CRE_OR_VEH_OR_PET_GUID(guid))
|
||||
else if (guid.IsAnyTypeCreature())
|
||||
{
|
||||
if (!_player->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_MAILBOX))
|
||||
return false;
|
||||
@@ -63,10 +63,10 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
uint64 money, COD;
|
||||
std::string receiverName, subject, body;
|
||||
uint32 bodyLength, subjectLength, receiverLength;
|
||||
uint32 unk1, unk2;
|
||||
uint32 package, stationery;
|
||||
|
||||
recvData >> unk1;
|
||||
recvData >> unk2; // Stationery?
|
||||
recvData >> package;
|
||||
recvData >> stationery;
|
||||
|
||||
recvData >> COD >> money; // money and cod
|
||||
bodyLength = recvData.ReadBits(12);
|
||||
@@ -152,7 +152,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
return;
|
||||
}
|
||||
|
||||
uint64 receiverGuid = 0;
|
||||
ObjectGuid receiverGuid;
|
||||
if (normalizePlayerName(receiverName))
|
||||
receiverGuid = sObjectMgr->GetPlayerGUIDByName(receiverName);
|
||||
|
||||
@@ -161,15 +161,15 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
TC_LOG_INFO("network", "Player %u is sending mail to %s (GUID: not existed!) with subject %s "
|
||||
"and body %s includes %u items, " UI64FMTD " copper and " UI64FMTD " COD copper with unk1 = %u, unk2 = %u",
|
||||
player->GetGUIDLow(), receiverName.c_str(), subject.c_str(), body.c_str(),
|
||||
items_count, money, COD, unk1, unk2);
|
||||
items_count, money, COD, stationery, package);
|
||||
player->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
|
||||
return;
|
||||
}
|
||||
|
||||
TC_LOG_INFO("network", "Player %u is sending mail to %s (GUID: %u) with subject %s and body %s "
|
||||
TC_LOG_INFO("network", "Player %u is sending mail to %s (%s) with subject %s and body %s "
|
||||
"includes %u items, " UI64FMTD " copper and " UI64FMTD " COD copper with unk1 = %u, unk2 = %u",
|
||||
player->GetGUIDLow(), receiverName.c_str(), GUID_LOPART(receiverGuid), subject.c_str(),
|
||||
body.c_str(), items_count, money, COD, unk1, unk2);
|
||||
player->GetGUIDLow(), receiverName.c_str(), receiverGuid.ToString().c_str(), subject.c_str(),
|
||||
body.c_str(), items_count, money, COD, stationery, package);
|
||||
|
||||
if (player->GetGUID() == receiverGuid)
|
||||
{
|
||||
@@ -215,7 +215,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
receiverTeam = sObjectMgr->GetPlayerTeamByGUID(receiverGuid);
|
||||
|
||||
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_MAIL_COUNT);
|
||||
stmt->setUInt32(0, GUID_LOPART(receiverGuid));
|
||||
stmt->setUInt32(0, receiverGuid.GetCounter());
|
||||
|
||||
PreparedQueryResult result = CharacterDatabase.Query(stmt);
|
||||
if (result)
|
||||
@@ -225,7 +225,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
}
|
||||
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_LEVEL);
|
||||
stmt->setUInt32(0, GUID_LOPART(receiverGuid));
|
||||
stmt->setUInt32(0, receiverGuid.GetCounter());
|
||||
|
||||
result = CharacterDatabase.Query(stmt);
|
||||
if (result)
|
||||
@@ -349,9 +349,9 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
if (log)
|
||||
{
|
||||
sLog->outCommand(GetAccountId(), "GM %s (GUID: %u) (Account: %u) mail item: %s (Entry: %u Count: %u) "
|
||||
"to player: %s (GUID: %u) (Account: %u)", GetPlayerName().c_str(), GetGuidLow(), GetAccountId(),
|
||||
"to: %s (%s) (Account: %u)", GetPlayerName().c_str(), GetGuidLow(), GetAccountId(),
|
||||
item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount(),
|
||||
receiverName.c_str(), GUID_LOPART(receiverGuid), receiverAccountId);
|
||||
receiverName.c_str(), receiverGuid.ToString().c_str(), receiverAccountId);
|
||||
}
|
||||
|
||||
item->SetNotRefundable(GetPlayer()); // makes the item no longer refundable
|
||||
@@ -370,8 +370,8 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
|
||||
if (log && money > 0)
|
||||
{
|
||||
sLog->outCommand(GetAccountId(), "GM %s (GUID: %u) (Account: %u) mail money: " UI64FMTD " to player: %s (GUID: %u) (Account: %u)",
|
||||
GetPlayerName().c_str(), GetGuidLow(), GetAccountId(), money, receiverName.c_str(), GUID_LOPART(receiverGuid), receiverAccountId);
|
||||
sLog->outCommand(GetAccountId(), "GM %s (GUID: %u) (Account: %u) mail money: " UI64FMTD " to: %s (%s) (Account: %u)",
|
||||
GetPlayerName().c_str(), GetGuidLow(), GetAccountId(), money, receiverName.c_str(), receiverGuid.ToString().c_str(), receiverAccountId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -391,7 +391,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
draft
|
||||
.AddMoney(money)
|
||||
.AddCOD(COD)
|
||||
.SendMailTo(trans, MailReceiver(receiver, GUID_LOPART(receiverGuid)), MailSender(player), body.empty() ? MAIL_CHECK_MASK_COPIED : MAIL_CHECK_MASK_HAS_BODY, deliver_delay);
|
||||
.SendMailTo(trans, MailReceiver(receiver, receiverGuid.GetCounter()), MailSender(player), body.empty() ? MAIL_CHECK_MASK_COPIED : MAIL_CHECK_MASK_HAS_BODY, deliver_delay);
|
||||
|
||||
player->SaveInventoryAndGoldToDB(trans);
|
||||
CharacterDatabase.CommitTransaction(trans);
|
||||
@@ -400,7 +400,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
|
||||
//called when mail is read
|
||||
void WorldSession::HandleMailMarkAsRead(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint32 mailId;
|
||||
recvData >> mailbox;
|
||||
recvData >> mailId;
|
||||
@@ -423,7 +423,7 @@ void WorldSession::HandleMailMarkAsRead(WorldPacket& recvData)
|
||||
//called when client deletes mail
|
||||
void WorldSession::HandleMailDelete(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint32 mailId;
|
||||
recvData >> mailbox;
|
||||
recvData >> mailId;
|
||||
@@ -451,7 +451,7 @@ void WorldSession::HandleMailDelete(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandleMailReturnToSender(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint32 mailId;
|
||||
recvData >> mailbox;
|
||||
recvData >> mailId;
|
||||
@@ -508,7 +508,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket& recvData)
|
||||
//called when player takes item attached in mail
|
||||
void WorldSession::HandleMailTakeItem(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint32 mailId;
|
||||
uint32 itemId;
|
||||
recvData >> mailbox;
|
||||
@@ -553,7 +553,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket& recvData)
|
||||
|
||||
if (m->COD > 0) //if there is COD, take COD money from player and send them to sender by mail
|
||||
{
|
||||
uint64 sender_guid = MAKE_NEW_GUID(m->sender, 0, HIGHGUID_PLAYER);
|
||||
ObjectGuid sender_guid(HIGHGUID_PLAYER, m->sender);
|
||||
Player* receiver = ObjectAccessor::FindPlayer(sender_guid);
|
||||
|
||||
uint32 sender_accId = 0;
|
||||
@@ -611,7 +611,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandleMailTakeMoney(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint64 money;
|
||||
uint32 mailId;
|
||||
|
||||
@@ -654,7 +654,7 @@ void WorldSession::HandleMailTakeMoney(WorldPacket& recvData)
|
||||
//called when player lists his received mails
|
||||
void WorldSession::HandleGetMailList(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
recvData >> mailbox;
|
||||
|
||||
if (!CanOpenMailBox(mailbox))
|
||||
@@ -707,7 +707,7 @@ void WorldSession::HandleGetMailList(WorldPacket& recvData)
|
||||
switch ((*itr)->messageType)
|
||||
{
|
||||
case MAIL_NORMAL: // sender guid
|
||||
data << uint64(MAKE_NEW_GUID((*itr)->sender, 0, HIGHGUID_PLAYER));
|
||||
data << ObjectGuid(HIGHGUID_PLAYER, (*itr)->sender);
|
||||
break;
|
||||
case MAIL_CREATURE:
|
||||
case MAIL_GAMEOBJECT:
|
||||
@@ -775,7 +775,7 @@ void WorldSession::HandleGetMailList(WorldPacket& recvData)
|
||||
//used when player copies mail body to his inventory
|
||||
void WorldSession::HandleMailCreateTextItem(WorldPacket& recvData)
|
||||
{
|
||||
uint64 mailbox;
|
||||
ObjectGuid mailbox;
|
||||
uint32 mailId;
|
||||
|
||||
recvData >> mailbox;
|
||||
@@ -815,7 +815,9 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket& recvData)
|
||||
else
|
||||
bodyItem->SetText(m->body);
|
||||
|
||||
bodyItem->SetUInt32Value(ITEM_FIELD_CREATOR, m->sender);
|
||||
if (m->messageType == MAIL_NORMAL)
|
||||
bodyItem->SetGuidValue(ITEM_FIELD_CREATOR, ObjectGuid(HIGHGUID_PLAYER, m->sender));
|
||||
|
||||
bodyItem->SetFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_MAIL_TEXT_MASK);
|
||||
|
||||
TC_LOG_INFO("network", "HandleMailCreateTextItem mailid=%u", mailId);
|
||||
@@ -869,7 +871,7 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket& /*recvData*/)
|
||||
if (sentSenders.count(m->sender))
|
||||
continue;
|
||||
|
||||
data << uint64(m->messageType == MAIL_NORMAL ? m->sender : 0); // player guid
|
||||
data << uint64(m->messageType == MAIL_NORMAL ? ObjectGuid(HIGHGUID_PLAYER, m->sender) : ObjectGuid::Empty); // player guid
|
||||
data << uint32(m->messageType != MAIL_NORMAL ? m->sender : 0); // non-player entries
|
||||
data << uint32(m->messageType);
|
||||
data << uint32(m->stationery);
|
||||
@@ -891,10 +893,3 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket& /*recvData*/)
|
||||
|
||||
SendPacket(&data);
|
||||
}
|
||||
|
||||
void WorldSession::SendShowMailBox(uint64 guid)
|
||||
{
|
||||
WorldPacket data(SMSG_SHOW_MAILBOX, 8);
|
||||
data << guid;
|
||||
SendPacket(&data);
|
||||
}
|
||||
Reference in new issue
Block a user