mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 10:05:32 +01:00
Merge branch 'master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/Guild.cpp src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/BattlefieldHandler.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/PetitionsHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Tools/PlayerDump.cpp src/server/game/World/World.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Commands/cs_reload.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
@@ -105,7 +105,7 @@ void Guild::SendCommandResult(WorldSession* session, GuildCommandType type, Guil
|
||||
data << uint32(errCode);
|
||||
session->SendPacket(&data);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_COMMAND_RESULT [%s]: Type: %u, code: %u, param: %s"
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_COMMAND_RESULT [%s]: Type: %u, code: %u, param: %s"
|
||||
, session->GetPlayerInfo().c_str(), type, errCode, param.c_str());
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ void Guild::SendSaveEmblemResult(WorldSession* session, GuildEmblemError errCode
|
||||
data << uint32(errCode);
|
||||
session->SendPacket(&data);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s] Code: %u", session->GetPlayerInfo().c_str(), errCode);
|
||||
TC_LOG_DEBUG("guild", "MSG_SAVE_GUILD_EMBLEM [%s] Code: %u", session->GetPlayerInfo().c_str(), errCode);
|
||||
}
|
||||
|
||||
// LogHolder
|
||||
@@ -402,7 +402,7 @@ void Guild::RankInfo::CreateMissingTabsIfNeeded(uint8 tabs, SQLTransaction& tran
|
||||
rightsAndSlots.SetGuildMasterValues();
|
||||
|
||||
if (logOnCreate)
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild %u has broken Tab %u for rank %u. Created default tab.", m_guildId, i, m_rankId);
|
||||
TC_LOG_ERROR("guild", "Guild %u has broken Tab %u for rank %u. Created default tab.", m_guildId, i, m_rankId);
|
||||
|
||||
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_BANK_RIGHT);
|
||||
stmt->setUInt32(0, m_guildId);
|
||||
@@ -497,21 +497,21 @@ bool Guild::BankTab::LoadItemFromDB(Field* fields)
|
||||
uint32 itemEntry = fields[15].GetUInt32();
|
||||
if (slotId >= GUILD_BANK_MAX_SLOTS)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Invalid slot for item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
|
||||
TC_LOG_ERROR("guild", "Invalid slot for item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemEntry);
|
||||
if (!proto)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Unknown item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
|
||||
TC_LOG_ERROR("guild", "Unknown item (GUID: %u, id: %u) in guild bank, skipped.", itemGuid, itemEntry);
|
||||
return false;
|
||||
}
|
||||
|
||||
Item* pItem = NewItemOrBag(proto);
|
||||
if (!pItem->LoadFromDB(itemGuid, 0, fields, itemEntry))
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Item (GUID %u, id: %u) not found in item_instance, deleting from guild bank!", itemGuid, itemEntry);
|
||||
TC_LOG_ERROR("guild", "Item (GUID %u, id: %u) not found in item_instance, deleting from guild bank!", itemGuid, itemEntry);
|
||||
|
||||
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEM);
|
||||
stmt->setUInt32(0, m_guildId);
|
||||
@@ -614,13 +614,13 @@ void Guild::BankTab::SendText(Guild const* guild, WorldSession* session) const
|
||||
|
||||
if (session)
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_QUERY_TEXT_RESULT [%s]: Tabid: %u, Text: %s"
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_BANK_QUERY_TEXT_RESULT [%s]: Tabid: %u, Text: %s"
|
||||
, session->GetPlayerInfo().c_str(), m_tabId, m_text.c_str());
|
||||
session->SendPacket(&data);
|
||||
}
|
||||
else
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_QUERY_TEXT_RESULT [Broadcast]: Tabid: %u, Text: %s", m_tabId, m_text.c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_BANK_QUERY_TEXT_RESULT [Broadcast]: Tabid: %u, Text: %s", m_tabId, m_text.c_str());
|
||||
guild->BroadcastPacket(&data);
|
||||
}
|
||||
}
|
||||
@@ -724,7 +724,7 @@ bool Guild::Member::LoadFromDB(Field* fields)
|
||||
|
||||
if (!m_zoneId)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Player (GUID: %u) has broken zone-data", GUID_LOPART(m_guid));
|
||||
TC_LOG_ERROR("guild", "Player (GUID: %u) has broken zone-data", GUID_LOPART(m_guid));
|
||||
m_zoneId = Player::GetZoneIdFromDB(m_guid);
|
||||
}
|
||||
ResetFlags();
|
||||
@@ -736,13 +736,13 @@ bool Guild::Member::CheckStats() const
|
||||
{
|
||||
if (m_level < 1)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Player (GUID: %u) has a broken data in field `characters`.`level`, deleting him from guild!", GUID_LOPART(m_guid));
|
||||
TC_LOG_ERROR("guild", "Player (GUID: %u) has a broken data in field `characters`.`level`, deleting him from guild!", GUID_LOPART(m_guid));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_class < CLASS_WARRIOR || m_class >= MAX_CLASSES)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Player (GUID: %u) has a broken data in field `characters`.`class`, deleting him from guild!", GUID_LOPART(m_guid));
|
||||
TC_LOG_ERROR("guild", "Player (GUID: %u) has a broken data in field `characters`.`class`, deleting him from guild!", GUID_LOPART(m_guid));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -996,7 +996,7 @@ Item* Guild::BankMoveItemData::StoreItem(SQLTransaction& trans, Item* pItem)
|
||||
ItemPosCount pos(*itr);
|
||||
++itr;
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u",
|
||||
TC_LOG_DEBUG("guild", "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u",
|
||||
m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
|
||||
pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end());
|
||||
}
|
||||
@@ -1107,7 +1107,7 @@ void Guild::BankMoveItemData::CanStoreItemInTab(Item* pItem, uint8 skipSlotId, b
|
||||
|
||||
InventoryResult Guild::BankMoveItemData::CanStore(Item* pItem, bool swap)
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "GUILD STORAGE: CanStore() tab = %u, slot = %u, item = %u, count = %u",
|
||||
TC_LOG_DEBUG("guild", "GUILD STORAGE: CanStore() tab = %u, slot = %u, item = %u, count = %u",
|
||||
m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
|
||||
|
||||
uint32 count = pItem->GetCount();
|
||||
@@ -1215,7 +1215,7 @@ bool Guild::Create(Player* pLeader, std::string const& name)
|
||||
_todayExperience = 0;
|
||||
_CreateLogHolders();
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "GUILD: creating guild [%s] for leader %s (%u)",
|
||||
TC_LOG_DEBUG("guild", "GUILD: creating guild [%s] for leader %s (%u)",
|
||||
name.c_str(), pLeader->GetName().c_str(), GUID_LOPART(m_leaderGuid));
|
||||
|
||||
SQLTransaction trans = CharacterDatabase.BeginTransaction();
|
||||
@@ -1339,7 +1339,7 @@ void Guild::UpdateMemberData(Player* player, uint8 dataid, uint32 value)
|
||||
member->SetLevel(value);
|
||||
break;
|
||||
default:
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild::UpdateMemberData: Called with incorrect DATAID %u (value %u)", dataid, value);
|
||||
TC_LOG_ERROR("guild", "Guild::UpdateMemberData: Called with incorrect DATAID %u (value %u)", dataid, value);
|
||||
return;
|
||||
}
|
||||
//HandleRoster();
|
||||
@@ -1476,12 +1476,12 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/)
|
||||
|
||||
if (session)
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str());
|
||||
session->SendPacket(&data);
|
||||
}
|
||||
else
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [Broadcast]");
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_ROSTER [Broadcast]");
|
||||
BroadcastPacket(&data);
|
||||
}
|
||||
}
|
||||
@@ -1524,7 +1524,7 @@ void Guild::HandleQuery(WorldSession* session)
|
||||
data << uint32(_GetRanksSize()); // Number of ranks used
|
||||
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_QUERY_RESPONSE [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_QUERY_RESPONSE [%s]", session->GetPlayerInfo().c_str());
|
||||
}
|
||||
|
||||
void Guild::SendGuildRankInfo(WorldSession* session) const
|
||||
@@ -1562,7 +1562,7 @@ void Guild::SendGuildRankInfo(WorldSession* session) const
|
||||
data.FlushBits();
|
||||
data.append(rankData);
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_RANK [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_RANK [%s]", session->GetPlayerInfo().c_str());
|
||||
}
|
||||
|
||||
void Guild::HandleSetMOTD(WorldSession* session, std::string const& motd)
|
||||
@@ -1651,7 +1651,7 @@ void Guild::HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string
|
||||
BankTab* tab = GetBankTab(tabId);
|
||||
if (!tab)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild::HandleSetBankTabInfo: Player %s trying to change bank tab info from unexisting tab %d.",
|
||||
TC_LOG_ERROR("guild", "Guild::HandleSetBankTabInfo: Player %s trying to change bank tab info from unexisting tab %d.",
|
||||
session->GetPlayerInfo().c_str(), tabId);
|
||||
return;
|
||||
}
|
||||
@@ -1686,7 +1686,7 @@ void Guild::HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string c
|
||||
SendCommandResult(session, GUILD_COMMAND_CHANGE_RANK, ERR_GUILD_PERMISSIONS);
|
||||
else if (RankInfo* rankInfo = GetRankInfo(rankId))
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "Changed RankName to '%s', rights to 0x%08X", name.c_str(), rights);
|
||||
TC_LOG_DEBUG("guild", "Changed RankName to '%s', rights to 0x%08X", name.c_str(), rights);
|
||||
|
||||
rankInfo->SetName(name);
|
||||
rankInfo->SetRights(rights);
|
||||
@@ -1778,7 +1778,7 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
|
||||
|
||||
SendCommandResult(session, GUILD_COMMAND_INVITE, ERR_GUILD_COMMAND_SUCCESS, name);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "Player %s invited %s to join his Guild", player->GetName().c_str(), name.c_str());
|
||||
TC_LOG_DEBUG("guild", "Player %s invited %s to join his Guild", player->GetName().c_str(), name.c_str());
|
||||
|
||||
pInvitee->SetGuildIdInvited(m_id);
|
||||
_LogEvent(GUILD_EVENT_LOG_INVITE_PLAYER, player->GetGUIDLow(), pInvitee->GetGUIDLow());
|
||||
@@ -1843,7 +1843,7 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name)
|
||||
data.WriteByteSeq(newGuildGuid[3]);
|
||||
data.WriteByteSeq(oldGuildGuid[4]);
|
||||
pInvitee->GetSession()->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_INVITE [%s]", pInvitee->GetName().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_INVITE [%s]", pInvitee->GetName().c_str());
|
||||
}
|
||||
|
||||
void Guild::HandleAcceptMember(WorldSession* session)
|
||||
@@ -2134,7 +2134,7 @@ void Guild::HandleDisband(WorldSession* session)
|
||||
if (_IsLeader(session->GetPlayer()))
|
||||
{
|
||||
Disband();
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "Guild Successfully Disbanded");
|
||||
TC_LOG_DEBUG("guild", "Guild Successfully Disbanded");
|
||||
delete this;
|
||||
}
|
||||
}
|
||||
@@ -2156,7 +2156,7 @@ void Guild::HandleGuildPartyRequest(WorldSession* session)
|
||||
data << uint32(0); // Needed guild members
|
||||
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_PARTY_STATE_RESPONSE [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_PARTY_STATE_RESPONSE [%s]", session->GetPlayerInfo().c_str());
|
||||
}
|
||||
|
||||
void Guild::SendEventLog(WorldSession* session) const
|
||||
@@ -2164,7 +2164,7 @@ void Guild::SendEventLog(WorldSession* session) const
|
||||
WorldPacket data(SMSG_GUILD_EVENT_LOG_QUERY_RESULT, 1 + m_eventLog->GetSize() * (1 + 8 + 4));
|
||||
m_eventLog->WritePacket(data);
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT_LOG_QUERY_RESULT [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT_LOG_QUERY_RESULT [%s]", session->GetPlayerInfo().c_str());
|
||||
}
|
||||
|
||||
void Guild::SendNewsUpdate(WorldSession* session)
|
||||
@@ -2219,7 +2219,7 @@ void Guild::SendNewsUpdate(WorldSession* session)
|
||||
}
|
||||
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_NEWS_UPDATE [%s]", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_NEWS_UPDATE [%s]", session->GetPlayerInfo().c_str());
|
||||
}
|
||||
|
||||
void Guild::SendBankLog(WorldSession* session, uint8 tabId) const
|
||||
@@ -2235,7 +2235,7 @@ void Guild::SendBankLog(WorldSession* session, uint8 tabId) const
|
||||
//if (tabId == GUILD_BANK_MAX_TABS && hasCashFlow)
|
||||
// data << uint64(cashFlowContribution);
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LOG_QUERY_RESULT [%s] TabId: %u", session->GetPlayerInfo().c_str(), tabId);
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_BANK_LOG_QUERY_RESULT [%s] TabId: %u", session->GetPlayerInfo().c_str(), tabId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2266,7 +2266,7 @@ void Guild::SendPermissions(WorldSession* session) const
|
||||
}
|
||||
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_PERMISSIONS_QUERY_RESULTS [%s] Rank: %u", session->GetPlayerInfo().c_str(), rankId);
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_PERMISSIONS_QUERY_RESULTS [%s] Rank: %u", session->GetPlayerInfo().c_str(), rankId);
|
||||
}
|
||||
|
||||
void Guild::SendMoneyInfo(WorldSession* session) const
|
||||
@@ -2279,7 +2279,7 @@ void Guild::SendMoneyInfo(WorldSession* session) const
|
||||
WorldPacket data(SMSG_GUILD_BANK_MONEY_WITHDRAWN, 8);
|
||||
data << int64(amount);
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_MONEY_WITHDRAWN [%s] Money: %u", session->GetPlayerInfo().c_str(), amount);
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_BANK_MONEY_WITHDRAWN [%s] Money: %u", session->GetPlayerInfo().c_str(), amount);
|
||||
}
|
||||
|
||||
void Guild::SendLoginInfo(WorldSession* session)
|
||||
@@ -2306,7 +2306,7 @@ void Guild::SendLoginInfo(WorldSession* session)
|
||||
data << m_motd;
|
||||
session->SendPacket(&data);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [%s] MOTD", session->GetPlayerInfo().c_str());
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT [%s] MOTD", session->GetPlayerInfo().c_str());
|
||||
|
||||
SendGuildRankInfo(session);
|
||||
_BroadcastEvent(GE_SIGNED_ON, player->GetGUID(), player->GetName().c_str());
|
||||
@@ -2429,13 +2429,13 @@ bool Guild::LoadBankEventLogFromDB(Field* fields)
|
||||
{
|
||||
if (!isMoneyTab)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "GuildBankEventLog ERROR: MoneyEvent(LogGuid: %u, Guild: %u) does not belong to money tab (%u), ignoring...", guid, m_id, dbTabId);
|
||||
TC_LOG_ERROR("guild", "GuildBankEventLog ERROR: MoneyEvent(LogGuid: %u, Guild: %u) does not belong to money tab (%u), ignoring...", guid, m_id, dbTabId);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (isMoneyTab)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "GuildBankEventLog ERROR: non-money event (LogGuid: %u, Guild: %u) belongs to money tab, ignoring...", guid, m_id);
|
||||
TC_LOG_ERROR("guild", "GuildBankEventLog ERROR: non-money event (LogGuid: %u, Guild: %u) belongs to money tab, ignoring...", guid, m_id);
|
||||
return false;
|
||||
}
|
||||
pLog->LoadEvent(new BankEventLogEntry(
|
||||
@@ -2472,7 +2472,7 @@ void Guild::LoadBankTabFromDB(Field* fields)
|
||||
{
|
||||
uint8 tabId = fields[1].GetUInt8();
|
||||
if (tabId >= _GetPurchasedTabsSize())
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Invalid tab (tabId: %u) in guild bank, skipped.", tabId);
|
||||
TC_LOG_ERROR("guild", "Invalid tab (tabId: %u) in guild bank, skipped.", tabId);
|
||||
else
|
||||
m_bankTabs[tabId]->LoadFromDB(fields);
|
||||
}
|
||||
@@ -2482,7 +2482,7 @@ bool Guild::LoadBankItemFromDB(Field* fields)
|
||||
uint8 tabId = fields[12].GetUInt8();
|
||||
if (tabId >= _GetPurchasedTabsSize())
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Invalid tab for item (GUID: %u, id: #%u) in guild bank, skipped.",
|
||||
TC_LOG_ERROR("guild", "Invalid tab for item (GUID: %u, id: #%u) in guild bank, skipped.",
|
||||
fields[14].GetUInt32(), fields[15].GetUInt32());
|
||||
return false;
|
||||
}
|
||||
@@ -2501,7 +2501,7 @@ bool Guild::Validate()
|
||||
uint8 ranks = _GetRanksSize();
|
||||
if (ranks < GUILD_RANKS_MIN_COUNT || ranks > GUILD_RANKS_MAX_COUNT)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild %u has invalid number of ranks, creating new...", m_id);
|
||||
TC_LOG_ERROR("guild", "Guild %u has invalid number of ranks, creating new...", m_id);
|
||||
broken_ranks = true;
|
||||
}
|
||||
else
|
||||
@@ -2511,7 +2511,7 @@ bool Guild::Validate()
|
||||
RankInfo* rankInfo = GetRankInfo(rankId);
|
||||
if (rankInfo->GetId() != rankId)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_GUILD, "Guild %u has broken rank id %u, creating default set of ranks...", m_id, rankId);
|
||||
TC_LOG_ERROR("guild", "Guild %u has broken rank id %u, creating default set of ranks...", m_id, rankId);
|
||||
broken_ranks = true;
|
||||
}
|
||||
else
|
||||
@@ -3141,7 +3141,7 @@ void Guild::_MoveItems(MoveItemData* pSrc, MoveItemData* pDest, uint32 splitedAm
|
||||
/*
|
||||
if (pItemSrc->GetCount() == 0)
|
||||
{
|
||||
TC_LOG_FATAL(LOG_FILTER_GUILD, "Guild::SwapItems: Player %s(GUIDLow: %u) tried to move item %u from tab %u slot %u to tab %u slot %u, but item %u has a stack of zero!",
|
||||
TC_LOG_FATAL("guild", "Guild::SwapItems: Player %s(GUIDLow: %u) tried to move item %u from tab %u slot %u to tab %u slot %u, but item %u has a stack of zero!",
|
||||
player->GetName(), player->GetGUIDLow(), pItemSrc->GetEntry(), tabId, slotId, destTabId, destSlotId, pItemSrc->GetEntry());
|
||||
//return; // Commented out for now, uncomment when it's verified that this causes a crash!!
|
||||
}
|
||||
@@ -3328,7 +3328,7 @@ void Guild::_SendBankContentUpdate(uint8 tabId, SlotIds slots) const
|
||||
player->GetSession()->SendPacket(&data);
|
||||
}
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "WORLD: Sent (SMSG_GUILD_BANK_LIST)");
|
||||
TC_LOG_DEBUG("guild", "WORLD: Sent (SMSG_GUILD_BANK_LIST)");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3352,8 +3352,8 @@ void Guild::_BroadcastEvent(GuildEvents guildEvent, uint64 guid, const char* par
|
||||
|
||||
BroadcastPacket(&data);
|
||||
|
||||
if (sLog->ShouldLog(LOG_FILTER_GUILD, LOG_LEVEL_DEBUG))
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_EVENT [Broadcast] Event: %s (%u)", _GetGuildEventString(guildEvent).c_str(), guildEvent);
|
||||
if (sLog->ShouldLog("guild", LOG_LEVEL_DEBUG))
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT [Broadcast] Event: %s (%u)", _GetGuildEventString(guildEvent).c_str(), guildEvent);
|
||||
}
|
||||
|
||||
void Guild::SendBankList(WorldSession* session, uint8 tabId, bool withContent, bool withTabInfo) const
|
||||
@@ -3442,7 +3442,7 @@ void Guild::SendBankList(WorldSession* session, uint8 tabId, bool withContent, b
|
||||
|
||||
session->SendPacket(&data);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "WORLD: Sent (SMSG_GUILD_BANK_LIST)");
|
||||
TC_LOG_DEBUG("guild", "WORLD: Sent (SMSG_GUILD_BANK_LIST)");
|
||||
}
|
||||
|
||||
void Guild::SendGuildRanksUpdate(uint64 setterGuid, uint64 targetGuid, uint32 rank)
|
||||
@@ -3495,7 +3495,7 @@ void Guild::SendGuildRanksUpdate(uint64 setterGuid, uint64 targetGuid, uint32 ra
|
||||
|
||||
member->ChangeRank(rank);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_NETWORKIO, "SMSG_GUILD_RANKS_UPDATE [Broadcast] Target: %u, Issuer: %u, RankId: %u",
|
||||
TC_LOG_DEBUG("network", "SMSG_GUILD_RANKS_UPDATE [Broadcast] Target: %u, Issuer: %u, RankId: %u",
|
||||
GUID_LOPART(targetGuid), GUID_LOPART(setterGuid), rank);
|
||||
}
|
||||
|
||||
@@ -3574,7 +3574,7 @@ void Guild::SendGuildReputationWeeklyCap(WorldSession* session, uint32 reputatio
|
||||
WorldPacket data(SMSG_GUILD_REPUTATION_WEEKLY_CAP, 4);
|
||||
data << uint32(cap);
|
||||
session->SendPacket(&data);
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "SMSG_GUILD_REPUTATION_WEEKLY_CAP [%s]: Left: %u",
|
||||
TC_LOG_DEBUG("guild", "SMSG_GUILD_REPUTATION_WEEKLY_CAP [%s]: Left: %u",
|
||||
session->GetPlayerInfo().c_str(), cap);
|
||||
}
|
||||
|
||||
@@ -3629,7 +3629,7 @@ void Guild::HandleNewsSetSticky(WorldSession* session, uint32 newsId, bool stick
|
||||
|
||||
if (itr == logs->end())
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "HandleNewsSetSticky: [%s] requested unknown newsId %u - Sticky: %u",
|
||||
TC_LOG_DEBUG("guild", "HandleNewsSetSticky: [%s] requested unknown newsId %u - Sticky: %u",
|
||||
session->GetPlayerInfo().c_str(), newsId, sticky);
|
||||
return;
|
||||
}
|
||||
@@ -3637,7 +3637,7 @@ void Guild::HandleNewsSetSticky(WorldSession* session, uint32 newsId, bool stick
|
||||
NewsLogEntry* news = (NewsLogEntry*)(*itr);
|
||||
news->SetSticky(sticky);
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "HandleNewsSetSticky: [%s] chenged newsId %u sticky to %u",
|
||||
TC_LOG_DEBUG("guild", "HandleNewsSetSticky: [%s] chenged newsId %u sticky to %u",
|
||||
session->GetPlayerInfo().c_str(), newsId, sticky);
|
||||
|
||||
WorldPacket data(SMSG_GUILD_NEWS_UPDATE, 7 + 32);
|
||||
|
||||
Reference in New Issue
Block a user