diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 12aee7af24..727e100007 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25643,7 +25643,9 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, GameObject* go) --loot->unlootedCount; if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(item->itemid)) - if (proto->GetQuality() > ITEM_QUALITY_EPIC || (proto->GetQuality() == ITEM_QUALITY_EPIC && proto->GetBaseItemLevel() >= MinNewsItemLevel[sWorld->getIntConfig(CONFIG_EXPANSION)])) + if ((proto->GetQuality() > ITEM_QUALITY_EPIC // always log legendary items + || (proto->GetQuality() == ITEM_QUALITY_EPIC && proto->GetBaseItemLevel() >= MinNewsItemLevel[sWorld->getIntConfig(CONFIG_EXPANSION)])) // log epic items when within item level range + && !proto->GetDuration()) // log items only when they are permanent (skipping legendary items from Kael'thas encounter for example) if (Guild* guild = GetGuild()) guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 859a44d5cb..8513034cd1 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -167,18 +167,6 @@ inline void Guild::LogHolder::AddEvent(CharacterDatabaseTransaction& trans, LogE entry->SaveToDB(trans); } -// Writes information about all events into packet. -inline void Guild::LogHolder::WritePacket(WorldPacket& data) const -{ - ByteBuffer buffer; - data.WriteBits(m_log.size(), 23); - for (auto itr = m_log.begin(); itr != m_log.end(); ++itr) - (*itr)->WritePacket(data, buffer); - - data.FlushBits(); - data.append(buffer); -} - inline uint32 Guild::LogHolder::GetNextGUID() { // Next guid was not initialized. It means there are no records for this holder in DB yet. @@ -210,56 +198,18 @@ void Guild::EventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const trans->Append(stmt); } -void Guild::EventLogEntry::WritePacket(WorldPacket& data, ByteBuffer& content) const +void Guild::EventLogEntry::WritePacket(WorldPackets::Guild::GuildEventLogQueryResults& packet) const { - ObjectGuid guid1 = ObjectGuid(HighGuid::Player, m_playerGuid1); - ObjectGuid guid2 = ObjectGuid(HighGuid::Player, m_playerGuid2); + ObjectGuid playerGUID = ObjectGuid::Create(m_playerGuid1); + ObjectGuid otherGUID = ObjectGuid::Create(m_playerGuid2); - data.WriteBit(guid1[2]); - data.WriteBit(guid1[4]); - data.WriteBit(guid2[7]); - data.WriteBit(guid2[6]); - data.WriteBit(guid1[3]); - data.WriteBit(guid2[3]); - data.WriteBit(guid2[5]); - data.WriteBit(guid1[7]); - data.WriteBit(guid1[5]); - data.WriteBit(guid1[0]); - data.WriteBit(guid2[4]); - data.WriteBit(guid2[2]); - data.WriteBit(guid2[0]); - data.WriteBit(guid2[1]); - data.WriteBit(guid1[1]); - data.WriteBit(guid1[6]); - - content.WriteByteSeq(guid2[3]); - content.WriteByteSeq(guid2[2]); - content.WriteByteSeq(guid2[5]); - - // New Rank - content << uint8(m_newRank); - - content.WriteByteSeq(guid2[4]); - content.WriteByteSeq(guid1[0]); - content.WriteByteSeq(guid1[4]); - - // Event timestamp - content << uint32(::GameTime::GetGameTime() - m_timestamp); - - content.WriteByteSeq(guid1[7]); - content.WriteByteSeq(guid1[3]); - content.WriteByteSeq(guid2[0]); - content.WriteByteSeq(guid2[6]); - content.WriteByteSeq(guid2[7]); - content.WriteByteSeq(guid1[5]); - - // Event type - content << uint8(m_eventType); - - content.WriteByteSeq(guid2[1]); - content.WriteByteSeq(guid1[2]); - content.WriteByteSeq(guid1[6]); - content.WriteByteSeq(guid1[1]); + WorldPackets::Guild::GuildEventEntry eventEntry; + eventEntry.PlayerGUID = playerGUID; + eventEntry.OtherGUID = otherGUID; + eventEntry.TransactionType = uint8(m_eventType); + eventEntry.TransactionDate = uint32(GameTime::GetGameTime() - m_timestamp); + eventEntry.RankID = uint8(m_newRank); + packet.Entry.push_back(eventEntry); } // BankEventLogEntry @@ -287,9 +237,9 @@ void Guild::BankEventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) con trans->Append(stmt); } -void Guild::BankEventLogEntry::WritePacket(WorldPacket& data, ByteBuffer& content) const +void Guild::BankEventLogEntry::WritePacket(WorldPackets::Guild:: GuildBankLogQueryResults& packet) const { - ObjectGuid logGuid = ObjectGuid(HighGuid::Player, m_playerGuid); + ObjectGuid logGuid = ObjectGuid::Create(m_playerGuid); bool hasItem = m_eventType == GUILD_BANK_LOG_DEPOSIT_ITEM || m_eventType == GUILD_BANK_LOG_WITHDRAW_ITEM || m_eventType == GUILD_BANK_LOG_MOVE_ITEM || m_eventType == GUILD_BANK_LOG_MOVE_ITEM2; @@ -298,41 +248,24 @@ void Guild::BankEventLogEntry::WritePacket(WorldPacket& data, ByteBuffer& conten bool hasStack = (hasItem && m_itemStackCount > 1) || itemMoved; - data.WriteBit(IsMoneyEvent()); - data.WriteBit(logGuid[4]); - data.WriteBit(logGuid[1]); - data.WriteBit(hasItem); - data.WriteBit(hasStack); - data.WriteBit(logGuid[2]); - data.WriteBit(logGuid[5]); - data.WriteBit(logGuid[3]); - data.WriteBit(logGuid[6]); - data.WriteBit(logGuid[0]); - data.WriteBit(itemMoved); - data.WriteBit(logGuid[7]); + WorldPackets::Guild::GuildBankLogEntry bankLogEntry; + bankLogEntry.PlayerGUID = logGuid; + bankLogEntry.TimeOffset = int32(GameTime::GetGameTime() - m_timestamp); + bankLogEntry.EntryType = int8(m_eventType); - content.WriteByteSeq(logGuid[6]); - content.WriteByteSeq(logGuid[1]); - content.WriteByteSeq(logGuid[5]); if (hasStack) - content << uint32(m_itemStackCount); - - content << uint8(m_eventType); - content.WriteByteSeq(logGuid[2]); - content.WriteByteSeq(logGuid[4]); - content.WriteByteSeq(logGuid[0]); - content.WriteByteSeq(logGuid[7]); - content.WriteByteSeq(logGuid[3]); - if (hasItem) - content << uint32(m_itemOrMoney); - - content << uint32(GameTime::GetGameTime() - m_timestamp); + bankLogEntry.Count = int32(m_itemStackCount); if (IsMoneyEvent()) - content << uint64(m_itemOrMoney); + bankLogEntry.Money = uint64(m_itemOrMoney); + + if (hasItem) + bankLogEntry.ItemID = int32(m_itemOrMoney); if (itemMoved) - content << uint8(m_destTabId); + bankLogEntry.OtherTab = int8(m_destTabId); + + packet.Entry.push_back(bankLogEntry); } void Guild::NewsLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const @@ -349,39 +282,22 @@ void Guild::NewsLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const CharacterDatabase.ExecuteOrAppend(trans, stmt); } -void Guild::NewsLogEntry::WritePacket(WorldPacket& data, ByteBuffer& /*content*/) const +void Guild::NewsLogEntry::WritePacket(WorldPackets::Guild::GuildNews& newsPacket) const { - data.WriteBits(0, 26); // Not yet implemented used for guild achievements - ObjectGuid guid = GetPlayerGuid(); + WorldPackets::Guild::GuildNewsEvent newsEvent; + newsEvent.Id = int32(GetGUID()); + newsEvent.MemberGuid = GetPlayerGuid(); + newsEvent.CompletedDate = uint32(GetTimestamp()); + newsEvent.Flags = int32(GetFlags()); + newsEvent.Type = int32(GetType()); + newsEvent.Data[0] = int32(GetValue()); - data.WriteBit(guid[7]); - data.WriteBit(guid[0]); - data.WriteBit(guid[6]); - data.WriteBit(guid[5]); - data.WriteBit(guid[4]); - data.WriteBit(guid[3]); - data.WriteBit(guid[1]); - data.WriteBit(guid[2]); + //for (uint8 i = 0; i < 2; i++) + // newsEvent.Data[i] = - data.FlushBits(); + //newsEvent.MemberList.push_back(MemberGuid); - data.WriteByteSeq(guid[5]); - - data << uint32(GetFlags()); // 1 sticky - data << uint32(GetValue()); - data << uint32(0); // always 0 - - data.WriteByteSeq(guid[7]); - data.WriteByteSeq(guid[6]); - data.WriteByteSeq(guid[2]); - data.WriteByteSeq(guid[3]); - data.WriteByteSeq(guid[0]); - data.WriteByteSeq(guid[4]); - data.WriteByteSeq(guid[1]); - - data << uint32(GetGUID()); - data << uint32(GetType()); - data.AppendPackedTime(GetTimestamp()); + newsPacket.NewsEvents.push_back(newsEvent); } // RankInfo @@ -2424,9 +2340,21 @@ void Guild::HandleGuildRequestChallengeUpdate(WorldSession* session) 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); + GuildLog* logs = m_eventLog->GetGuildLog(); + + if (!logs) + return; + + WorldPackets::Guild::GuildEventLogQueryResults packet; + packet.Entry.reserve(m_eventLog->GetSize()); + + for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) + { + EventLogEntry* eventLog = static_cast(*itr); + eventLog->WritePacket(packet); + } + + session->SendPacket(packet.Write()); TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT_LOG_QUERY_RESULT [%s]", session->GetPlayerInfo().c_str()); } @@ -2438,50 +2366,16 @@ void Guild::SendNewsUpdate(WorldSession* session) if (!logs) return; - WorldPacket data(SMSG_GUILD_NEWS_UPDATE, (21 + size * (26 + 8)) / 8 + (8 + 6 * 4) * size); - data.WriteBits(size, 21); + WorldPackets::Guild::GuildNews packet; + packet.NewsEvents.reserve(m_newsLog->GetSize()); for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) { - data.WriteBits(0, 26); // Not yet implemented used for guild achievements - ObjectGuid guid = ((NewsLogEntry*)(*itr))->GetPlayerGuid(); - - data.WriteBit(guid[7]); - data.WriteBit(guid[0]); - data.WriteBit(guid[6]); - data.WriteBit(guid[5]); - data.WriteBit(guid[4]); - data.WriteBit(guid[3]); - data.WriteBit(guid[1]); - data.WriteBit(guid[2]); + NewsLogEntry* eventLog = static_cast(*itr); + eventLog->WritePacket(packet); } - data.FlushBits(); - - for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) - { - NewsLogEntry* news = (NewsLogEntry*)(*itr); - ObjectGuid guid = news->GetPlayerGuid(); - data.WriteByteSeq(guid[5]); - - data << uint32(news->GetFlags()); // 1 sticky - data << uint32(news->GetValue()); - data << uint32(0); - - data.WriteByteSeq(guid[7]); - data.WriteByteSeq(guid[6]); - data.WriteByteSeq(guid[2]); - data.WriteByteSeq(guid[3]); - data.WriteByteSeq(guid[0]); - data.WriteByteSeq(guid[4]); - data.WriteByteSeq(guid[1]); - - data << uint32(news->GetGUID()); - data << uint32(news->GetType()); - data.AppendPackedTime(news->GetTimestamp()); - } - - session->SendPacket(&data); + session->SendPacket(packet.Write()); TC_LOG_DEBUG("guild", "SMSG_GUILD_NEWS_UPDATE [%s]", session->GetPlayerInfo().c_str()); } @@ -2490,14 +2384,26 @@ void Guild::SendBankLog(WorldSession* session, uint8 tabId) const // GUILD_BANK_MAX_TABS send by client for money log if (tabId < _GetPurchasedTabsSize() || tabId == GUILD_BANK_MAX_TABS) { - LogHolder const* log = m_bankEventLog[tabId]; - WorldPacket data(SMSG_GUILD_BANK_LOG_QUERY_RESULT, log->GetSize() * (4 * 4 + 1) + 1 + 1); - data.WriteBit(GetLevel() >= 5 && tabId == GUILD_BANK_MAX_TABS); // has Cash Flow perk - log->WritePacket(data); - data << uint32(tabId); + GuildLog* logs = m_bankEventLog[tabId]->GetGuildLog(); + + if (!logs) + return; + + WorldPackets::Guild::GuildBankLogQueryResults packet; + packet.Tab = int32(tabId); + //if (tabId == GUILD_BANK_MAX_TABS && hasCashFlow) - // data << uint64(cashFlowContribution); - session->SendPacket(&data); + // packet.WeeklyBonusMoney.Set(uint64(weeklyBonusMoney)); + + packet.Entry.reserve(m_bankEventLog[tabId]->GetSize()); + for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) + { + BankEventLogEntry* bankEventLog = static_cast(*itr); + bankEventLog->WritePacket(packet); + } + + session->SendPacket(packet.Write()); + TC_LOG_DEBUG("guild", "SMSG_GUILD_BANK_LOG_QUERY_RESULT [%s] TabId: %u", session->GetPlayerInfo().c_str(), tabId); } } @@ -4047,12 +3953,10 @@ void Guild::AddGuildNews(uint8 type, ObjectGuid guid, uint32 flags, uint32 value m_newsLog->AddEvent(trans, news); CharacterDatabase.CommitTransaction(trans); - WorldPacket data(SMSG_GUILD_NEWS_UPDATE, 7 + 32); - data.WriteBits(1, 21); // size, we are only sending 1 news here - ByteBuffer buffer; - news->WritePacket(data, buffer); - - BroadcastPacket(&data); + WorldPackets::Guild::GuildNews newsPacket; + newsPacket.NewsEvents.reserve(1); + news->WritePacket(newsPacket); + BroadcastPacket(newsPacket.Write()); } bool Guild::HasAchieved(uint32 achievementId) const @@ -4085,11 +3989,10 @@ void Guild::HandleNewsSetSticky(WorldSession* session, uint32 newsId, bool stick 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); - data.WriteBits(1, 21); - ByteBuffer buffer; - news->WritePacket(data, buffer); - session->SendPacket(&data); + WorldPackets::Guild::GuildNews newsPacket; + newsPacket.NewsEvents.reserve(1); + news->WritePacket(newsPacket); + session->SendPacket(newsPacket.Write()); } void Guild::SendKnownRecipes(Player const* player) diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index dd19772b32..abe73f030b 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -39,6 +39,16 @@ enum AchievementCriteriaTypes : uint8; enum InventoryResult : uint8; enum LocaleConstant : uint8; +namespace WorldPackets +{ + namespace Guild + { + class GuildBankLogQueryResults; + class GuildEventLogQueryResults; + class GuildNews; + } +} + enum GuildMisc { GUILD_BANK_MAX_TABS = 8, // send by client for money log also @@ -461,7 +471,6 @@ private: uint64 GetTimestamp() const { return m_timestamp; } virtual void SaveToDB(CharacterDatabaseTransaction& trans) const = 0; - virtual void WritePacket(WorldPacket& data, ByteBuffer& content) const = 0; protected: ObjectGuid::LowType m_guildId; @@ -482,7 +491,7 @@ private: ~EventLogEntry() { } void SaveToDB(CharacterDatabaseTransaction& trans) const override; - void WritePacket(WorldPacket& data, ByteBuffer& content) const override; + void WritePacket(WorldPackets::Guild::GuildEventLogQueryResults& packet) const; private: GuildEventLogTypes m_eventType; @@ -520,7 +529,7 @@ private: ~BankEventLogEntry() { } void SaveToDB(CharacterDatabaseTransaction& trans) const override; - void WritePacket(WorldPacket& data, ByteBuffer& content) const override; + void WritePacket(WorldPackets::Guild:: GuildBankLogQueryResults& packet) const; private: GuildBankEventLogTypes m_eventType; @@ -556,7 +565,7 @@ private: } void SaveToDB(CharacterDatabaseTransaction& trans) const; - void WritePacket(WorldPacket& data, ByteBuffer& content) const; + void WritePacket(WorldPackets::Guild::GuildNews& newsPacket) const; private: GuildNews m_type; diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index 906d745653..8319b1d3e0 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -698,3 +698,190 @@ void WorldPackets::Guild::SetGuildMaster::Read() IsDethrone = _worldPacket.ReadBit(); NewMasterName = _worldPacket.ReadString(nameLen); } + +WorldPacket const* WorldPackets::Guild::GuildNews::Write() +{ + _worldPacket.WriteBits(NewsEvents.size(), 21); + + for (GuildNewsEvent const& newsEvent : NewsEvents) + { + _worldPacket.WriteBits(newsEvent.MemberList.size(), 26); + _worldPacket.WriteBit(newsEvent.MemberGuid[7]); + + for (ObjectGuid const& memberGuid : newsEvent.MemberList) + { + _worldPacket.WriteBit(memberGuid[7]); + _worldPacket.WriteBit(memberGuid[1]); + _worldPacket.WriteBit(memberGuid[5]); + _worldPacket.WriteBit(memberGuid[3]); + _worldPacket.WriteBit(memberGuid[4]); + _worldPacket.WriteBit(memberGuid[6]); + _worldPacket.WriteBit(memberGuid[0]); + _worldPacket.WriteBit(memberGuid[2]); + } + + _worldPacket.WriteBit(newsEvent.MemberGuid[0]); + _worldPacket.WriteBit(newsEvent.MemberGuid[6]); + _worldPacket.WriteBit(newsEvent.MemberGuid[5]); + _worldPacket.WriteBit(newsEvent.MemberGuid[4]); + _worldPacket.WriteBit(newsEvent.MemberGuid[3]); + _worldPacket.WriteBit(newsEvent.MemberGuid[1]); + _worldPacket.WriteBit(newsEvent.MemberGuid[2]); + } + + _worldPacket.FlushBits(); + + for (GuildNewsEvent const& newsEvent : NewsEvents) + { + for (ObjectGuid const& memberGuid : newsEvent.MemberList) + { + _worldPacket.WriteByteSeq(memberGuid[0]); + _worldPacket.WriteByteSeq(memberGuid[1]); + _worldPacket.WriteByteSeq(memberGuid[4]); + _worldPacket.WriteByteSeq(memberGuid[7]); + _worldPacket.WriteByteSeq(memberGuid[5]); + _worldPacket.WriteByteSeq(memberGuid[6]); + _worldPacket.WriteByteSeq(memberGuid[3]); + _worldPacket.WriteByteSeq(memberGuid[2]); + } + + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[5]); + + _worldPacket << uint32(newsEvent.Flags); + + for (int32 data : newsEvent.Data) + _worldPacket << int32(data); + + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[7]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[6]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[2]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[3]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[0]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[4]); + _worldPacket.WriteByteSeq(newsEvent.MemberGuid[1]); + + _worldPacket << int32(newsEvent.Id); + _worldPacket << int32(newsEvent.Type); + _worldPacket.AppendPackedTime(newsEvent.CompletedDate); + } + + return &_worldPacket; +} + +WorldPacket const* WorldPackets::Guild::GuildEventLogQueryResults::Write() +{ + _worldPacket.WriteBits(Entry.size(), 23); + + for (GuildEventEntry const& entry : Entry) + { + _worldPacket.WriteBit(entry.PlayerGUID[2]); + _worldPacket.WriteBit(entry.PlayerGUID[4]); + _worldPacket.WriteBit(entry.OtherGUID[7]); + _worldPacket.WriteBit(entry.OtherGUID[6]); + _worldPacket.WriteBit(entry.PlayerGUID[3]); + _worldPacket.WriteBit(entry.OtherGUID[3]); + _worldPacket.WriteBit(entry.OtherGUID[5]); + _worldPacket.WriteBit(entry.PlayerGUID[7]); + _worldPacket.WriteBit(entry.PlayerGUID[5]); + _worldPacket.WriteBit(entry.PlayerGUID[0]); + _worldPacket.WriteBit(entry.OtherGUID[4]); + _worldPacket.WriteBit(entry.OtherGUID[2]); + _worldPacket.WriteBit(entry.OtherGUID[0]); + _worldPacket.WriteBit(entry.OtherGUID[1]); + _worldPacket.WriteBit(entry.PlayerGUID[1]); + _worldPacket.WriteBit(entry.PlayerGUID[6]); + } + + _worldPacket.FlushBits(); + + for (GuildEventEntry const& entry : Entry) + { + _worldPacket.WriteByteSeq(entry.OtherGUID[3]); + _worldPacket.WriteByteSeq(entry.OtherGUID[2]); + _worldPacket.WriteByteSeq(entry.OtherGUID[5]); + + _worldPacket << uint8(entry.RankID); + + _worldPacket.WriteByteSeq(entry.OtherGUID[4]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[0]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[4]); + + _worldPacket << uint32(entry.TransactionDate); + + _worldPacket.WriteByteSeq(entry.PlayerGUID[7]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[3]); + _worldPacket.WriteByteSeq(entry.OtherGUID[0]); + _worldPacket.WriteByteSeq(entry.OtherGUID[6]); + _worldPacket.WriteByteSeq(entry.OtherGUID[7]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[5]); + + _worldPacket << uint8(entry.TransactionType); + + _worldPacket.WriteByteSeq(entry.OtherGUID[1]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[2]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[6]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[1]); + } + + return &_worldPacket; +} + +WorldPacket const* WorldPackets::Guild::GuildBankLogQueryResults::Write() +{ + _worldPacket.WriteBit(WeeklyBonusMoney.has_value()); + _worldPacket.WriteBits(Entry.size(), 23); + + for (GuildBankLogEntry const& entry : Entry) + { + _worldPacket.WriteBit(entry.Money.has_value()); + _worldPacket.WriteBit(entry.PlayerGUID[4]); + _worldPacket.WriteBit(entry.PlayerGUID[1]); + _worldPacket.WriteBit(entry.ItemID.has_value()); + _worldPacket.WriteBit(entry.Count.has_value()); + _worldPacket.WriteBit(entry.PlayerGUID[2]); + _worldPacket.WriteBit(entry.PlayerGUID[5]); + _worldPacket.WriteBit(entry.PlayerGUID[3]); + _worldPacket.WriteBit(entry.PlayerGUID[6]); + _worldPacket.WriteBit(entry.PlayerGUID[0]); + _worldPacket.WriteBit(entry.OtherTab.has_value()); + _worldPacket.WriteBit(entry.PlayerGUID[7]); + } + + _worldPacket.FlushBits(); + + for (GuildBankLogEntry const& entry : Entry) + { + _worldPacket.WriteByteSeq(entry.PlayerGUID[6]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[1]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[5]); + + if (entry.Count.has_value()) + _worldPacket << int32(*entry.Count); + + _worldPacket << int8(entry.EntryType); + + _worldPacket.WriteByteSeq(entry.PlayerGUID[2]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[4]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[0]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[7]); + _worldPacket.WriteByteSeq(entry.PlayerGUID[3]); + + if (entry.ItemID.has_value()) + _worldPacket << int32(*entry.ItemID); + + _worldPacket << uint32(entry.TimeOffset); + + if (entry.Money.has_value()) + _worldPacket << uint64(*entry.Money); + + if (entry.OtherTab.has_value()) + _worldPacket << int8(*entry.OtherTab); + } + + _worldPacket << int32(Tab); + + if (WeeklyBonusMoney.has_value()) + _worldPacket << uint64(*WeeklyBonusMoney); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index 4fa5814668..16a452cf24 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -571,6 +571,69 @@ namespace WorldPackets bool IsDethrone = false; std::string NewMasterName; }; + + struct GuildNewsEvent + { + int32 Id = 0; + int32 Type = 0; + int32 Flags = 0; + uint32 CompletedDate = 0; + std::array Data = { }; + ObjectGuid MemberGuid; + std::vector MemberList; + }; + + class GuildNews final : public ServerPacket + { + public: + GuildNews() : ServerPacket(SMSG_GUILD_NEWS, 25) { } + + WorldPacket const* Write() override; + + std::vector NewsEvents; + }; + + struct GuildEventEntry + { + ObjectGuid PlayerGUID; + ObjectGuid OtherGUID; + uint8 TransactionType = 0; + uint8 RankID = 0; + uint32 TransactionDate = 0; + }; + + class GuildEventLogQueryResults final : public ServerPacket + { + public: + GuildEventLogQueryResults() : ServerPacket(SMSG_GUILD_EVENT_LOG_QUERY_RESULTS, 4) { } + + WorldPacket const* Write() override; + + std::vector Entry; + }; + + struct GuildBankLogEntry + { + ObjectGuid PlayerGUID; + uint32 TimeOffset = 0; + int8 EntryType = 0; + Optional Money; + Optional ItemID; + Optional Count; + Optional OtherTab; + }; + + class GuildBankLogQueryResults final : public ServerPacket + { + public: + GuildBankLogQueryResults() : ServerPacket(SMSG_GUILD_BANK_LOG_QUERY_RESULTS, 25) { } + + WorldPacket const* Write() override; + + int32 Tab = 0; + std::vector Entry; + Optional WeeklyBonusMoney; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 9781ffc367..fd1a42a204 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -889,7 +889,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ACHIEVEMENT_EARNED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ACHIEVEMENT_MEMBERS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_BANK_QUERY_RESULTS, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_BANK_LOG_QUERY_RESULT, STATUS_NEVER, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_BANK_LOG_QUERY_RESULTS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_BANK_MONEY_WITHDRAWN, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_BANK_TEXT_QUERY_RESULT, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_CHALLENGE_COMPLETED, STATUS_NEVER, CONNECTION_TYPE_REALM); @@ -901,7 +901,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_CRITERIA_DELETED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_DECLINE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_LOG_QUERY_RESULT, STATUS_NEVER, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_LOG_QUERY_RESULTS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_FLAGGED_FOR_RENAME, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_INVITE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_INVITE_CANCEL, STATUS_NEVER, CONNECTION_TYPE_REALM); @@ -913,7 +913,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVE_COMPLETE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVE_STARTING, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NEWS_DELETED, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NEWS_UPDATE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NEWS, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_PARTY_STATE_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_PERMISSIONS_QUERY_RESULTS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_GUILD_INFO_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_REALM); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 2795dcacf8..06cbbea80d 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -827,7 +827,7 @@ enum OpcodeServer SMSG_GUILD_ACHIEVEMENT_EARNED = 0x50B5, SMSG_GUILD_ACHIEVEMENT_MEMBERS = 0x38A5, SMSG_GUILD_BANK_QUERY_RESULTS = 0x78A5, - SMSG_GUILD_BANK_LOG_QUERY_RESULT = 0x30B2, + SMSG_GUILD_BANK_LOG_QUERY_RESULTS = 0x30B2, SMSG_GUILD_BANK_MONEY_WITHDRAWN = 0x5DB4, SMSG_GUILD_BANK_TEXT_QUERY_RESULT = 0x75A3, SMSG_GUILD_CANCEL = 0x0000, @@ -840,7 +840,7 @@ enum OpcodeServer SMSG_GUILD_CRITERIA_DELETED = 0x55B1, SMSG_GUILD_DECLINE = 0x2C07, SMSG_GUILD_EVENT = 0x0705, - SMSG_GUILD_EVENT_LOG_QUERY_RESULT = 0x10B2, + SMSG_GUILD_EVENT_LOG_QUERY_RESULTS = 0x10B2, SMSG_GUILD_FLAGGED_FOR_RENAME = 0x30B6, SMSG_GUILD_INVITE = 0x14A2, SMSG_GUILD_INVITE_CANCEL = 0x0606, @@ -853,7 +853,7 @@ enum OpcodeServer SMSG_GUILD_MOVE_COMPLETE = 0x11B2, SMSG_GUILD_MOVE_STARTING = 0x70A4, SMSG_GUILD_NEWS_DELETED = 0x74A7, - SMSG_GUILD_NEWS_UPDATE = 0x35A7, + SMSG_GUILD_NEWS = 0x35A7, SMSG_GUILD_PARTY_STATE_RESPONSE = 0x50A6, SMSG_GUILD_PERMISSIONS_QUERY_RESULTS = 0x34A3, SMSG_QUERY_GUILD_INFO_RESPONSE = 0x0E06,