diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-05-30 23:42:09 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-05-30 23:42:09 +0200 |
| commit | d62b52befb1e16e6b854062d974756038c2b6e4e (patch) | |
| tree | b0c90cbc4e7c052064f4ed62aab1199d1172e50b /src/server/game/Server | |
| parent | 634ec0061f9358f03aba91dc5411c2d38de94f5c (diff) | |
Core/Addons: Removed AddonMgr
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 84 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 6 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 1 |
3 files changed, 0 insertions, 91 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 41141148922..5203cdc1f9b 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -827,89 +827,6 @@ void WorldSession::SaveTutorialsData(SQLTransaction& trans) _tutorialsChanged = false; } -void WorldSession::ReadAddonsInfo(ByteBuffer& data) -{ - if (data.rpos() + 4 > data.size()) - return; - - uint32 size; - data >> size; - - if (!size) - return; - - if (size > 0xFFFFF) - { - TC_LOG_DEBUG("addon", "WorldSession::ReadAddonsInfo: AddOnInfo too big, size %u", size); - return; - } - - uLongf uSize = size; - - uint32 pos = data.rpos(); - - ByteBuffer addonInfo; - addonInfo.resize(size); - - m_addonsList.clear(); - - if (uncompress(addonInfo.contents(), &uSize, data.contents() + pos, data.size() - pos) == Z_OK) - { - uint32 addonsCount; - addonInfo >> addonsCount; // addons count - - for (uint32 i = 0; i < addonsCount; ++i) - { - std::string addonName; - uint8 enabled; - uint32 crc, unk1; - - // check next addon data format correctness - if (addonInfo.rpos() + 1 > addonInfo.size()) - return; - - addonInfo >> addonName; - - addonInfo >> enabled >> crc >> unk1; - - TC_LOG_DEBUG("addon", "AddOn: %s (CRC: 0x%x) - enabled: 0x%x - Unknown2: 0x%x", addonName.c_str(), crc, enabled, unk1); - - AddonInfo addon(addonName, enabled, crc, 2, true); - - SavedAddon const* savedAddon = AddonMgr::GetAddonInfo(addonName); - if (savedAddon) - { - if (addon.CRC != savedAddon->CRC) - TC_LOG_WARN("addon", " Addon: %s: modified (CRC: 0x%x) - accountID %d)", addon.Name.c_str(), savedAddon->CRC, GetAccountId()); - else - TC_LOG_DEBUG("addon", "Addon: %s: validated (CRC: 0x%x) - accountID %d", addon.Name.c_str(), savedAddon->CRC, GetAccountId()); - } - else - { - AddonMgr::SaveAddon(addon); - TC_LOG_WARN("addon", "Addon: %s: unknown (CRC: 0x%x) - accountId %d (storing addon name and checksum to database)", addon.Name.c_str(), addon.CRC, GetAccountId()); - } - - /// @todo Find out when to not use CRC/pubkey, and other possible states. - m_addonsList.push_back(addon); - } - - uint32 currentTime; - addonInfo >> currentTime; - TC_LOG_DEBUG("addon", "AddOn: CurrentTime: %u", currentTime); - } - else - TC_LOG_DEBUG("addon", "AddOn: Addon packet uncompress error!"); -} - -void WorldSession::SendAddonsInfo() -{ - WorldPackets::ClientConfig::AddonInfo addonInfo; - addonInfo.Addons = &m_addonsList; - addonInfo.BannedAddons = AddonMgr::GetBannedAddons(); - SendPacket(addonInfo.Write()); -} - bool WorldSession::IsAddonRegistered(const std::string& prefix) const { if (!_filterAddonMessages) // if we have hit the softcap (64) nothing should be filtered @@ -1234,7 +1151,6 @@ void WorldSession::InitializeSessionCallback(SQLQueryHolder* realmHolder, SQLQue SendSetTimeZoneInformation(); SendFeatureSystemStatusGlueScreen(); - SendAddonsInfo(); SendClientCacheVersion(sWorld->getIntConfig(CONFIG_CLIENTCACHE_VERSION)); SendTutorialsData(); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index d58b03ebb2c..53119742c4c 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -25,7 +25,6 @@ #include "Common.h" #include "SharedDefines.h" -#include "AddonMgr.h" #include "DatabaseEnv.h" #include "World.h" #include "Packet.h" @@ -896,8 +895,6 @@ class TC_GAME_API WorldSession bool PlayerRecentlyLoggedOut() const { return m_playerRecentlyLogout; } bool PlayerDisconnected() const; - void ReadAddonsInfo(ByteBuffer& data); - void SendAddonsInfo(); bool IsAddonRegistered(const std::string& prefix) const; void SendPacket(WorldPacket const* packet, bool forced = false); @@ -1815,8 +1812,6 @@ class TC_GAME_API WorldSession std::unordered_map<uint32, std::function<void(MessageBuffer)>> _battlenetResponseCallbacks; uint32 _battlenetRequestToken; - typedef std::list<AddonInfo> AddonsList; - // Warden Warden* _warden; // Remains NULL if Warden system is not enabled by config @@ -1833,7 +1828,6 @@ class TC_GAME_API WorldSession AccountData _accountData[NUM_ACCOUNT_DATA_TYPES]; uint32 _tutorials[MAX_ACCOUNT_TUTORIAL_VALUES]; bool _tutorialsChanged; - AddonsList m_addonsList; std::vector<std::string> _registeredAddonPrefixes; bool _filterAddonMessages; uint32 recruiterId; diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 82acf2b1811..25b7116aa99 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -838,7 +838,6 @@ void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<WorldPackets::Auth:: _authed = true; _worldSession = new WorldSession(account.Game.Id, std::move(authSession->RealmJoinTicket), account.BattleNet.Id, shared_from_this(), account.Game.Security, account.Game.Expansion, mutetime, account.Game.OS, account.BattleNet.Locale, account.Game.Recruiter, account.Game.IsRectuiter); - _worldSession->ReadAddonsInfo(authSession->AddonInfo); // Initialize Warden system only if it is enabled by config if (wardenActive) |
