From e5681fe90492055dcbf8fe3f55c3cdec92213024 Mon Sep 17 00:00:00 2001 From: horn Date: Wed, 21 Nov 2012 18:01:55 +0100 Subject: Core/Calendar: Update calendar to 4.3.4 and enable calendar related opcodes --- src/server/game/Calendar/CalendarMgr.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/server/game/Calendar/CalendarMgr.cpp') diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 9f4816d6c7c..a7c9e007acc 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -510,6 +510,10 @@ void CalendarMgr::SendCalendarEventInviteAlert(CalendarEvent const& calendarEven data << uint32(calendarEvent.GetType()); data << int32(calendarEvent.GetDungeonId()); data << uint64(invite.GetInviteId()); + + Guild* guild = sGuildMgr->GetGuildById(calendarEvent.GetGuildId()); + data << uint64(guild ? guild->GetGUID() : 0); + data << uint8(invite.GetStatus()); data << uint8(invite.GetRank()); data.appendPackGUID(calendarEvent.GetCreatorGUID()); @@ -546,7 +550,9 @@ void CalendarMgr::SendCalendarEvent(uint64 guid, CalendarEvent const& calendarEv data << uint32(calendarEvent.GetFlags()); data.AppendPackedTime(calendarEvent.GetEventTime()); data.AppendPackedTime(calendarEvent.GetTimeZoneTime()); - data << uint32(calendarEvent.GetGuildId()); + + Guild* guild = sGuildMgr->GetGuildById(calendarEvent.GetGuildId()); + data << uint64(guild ? guild->GetGUID() : 0); data << uint32(eventInviteeList.size()); for (std::vector::const_iterator itr = eventInviteeList.begin(); itr != eventInviteeList.end(); ++itr) -- cgit v1.2.3