diff options
| author | Gerhood <mrambrius@gmail.com> | 2017-10-27 14:59:22 +0200 |
|---|---|---|
| committer | Keader <keader.android@gmail.com> | 2017-10-27 10:59:22 -0200 |
| commit | 951fa46fe9b14a9e275ac9306b2346959e40e3e5 (patch) | |
| tree | 920c104065c90d759e156222fc5b596d1327ad5e /src/server/game/Handlers/CalendarHandler.cpp | |
| parent | 04271388f8ba5160de0411451673a67a6828ae8a (diff) | |
Calendar/GameEvents: Store + send holiday data (#20117)
Close: #16845
Diffstat (limited to 'src/server/game/Handlers/CalendarHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CalendarHandler.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 6d884ca2ee9..4384ff82474 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -41,6 +41,7 @@ Copied events should probably have a new owner #include "CharacterCache.h" #include "DatabaseEnv.h" #include "DBCStores.h" +#include "GameEventMgr.h" #include "Guild.h" #include "GuildMgr.h" #include "InstanceSaveMgr.h" @@ -151,12 +152,10 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/) data << uint32(boundCounter); data.append(dataBuffer); - /// @todo Fix this, how we do know how many and what holidays to send? - uint32 holidayCount = 0; - data << uint32(holidayCount); - for (uint32 i = 0; i < holidayCount; ++i) + data << uint32(sGameEventMgr->modifiedHolidays.size()); + for (uint32 entry : sGameEventMgr->modifiedHolidays) { - HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(666); + HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(entry); data << uint32(holiday->Id); // m_ID data << uint32(holiday->Region); // m_region, might be looping |