diff options
| author | Spp <spp@jorge.gr> | 2012-11-22 15:04:59 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-22 15:04:59 +0100 |
| commit | b9b57c2d62fe68f5b35bf7cdb2fb6a68e501ca5e (patch) | |
| tree | 7c15f9bd2298d0fc8564a12397e485317e754bcd /src/server/game/Handlers/CalendarHandler.cpp | |
| parent | 7416ada4f7b28c6fa8a9fd18d90327c1314106d4 (diff) | |
| parent | 32c259b1ce88c36015514018e95a7d6c29420678 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
Diffstat (limited to 'src/server/game/Handlers/CalendarHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/CalendarHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 12873d2d4a4..c13831066e6 100755 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -249,7 +249,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket& recvData) if (calendarEvent->IsGuildAnnouncement()) { // 946684800 is 01/01/2000 00:00:00 - default response time - CalendarInvite* invite = new CalendarInvite(sCalendarMgr->GetFreeInviteId(), calendarEvent->GetEventId(), 0, guid, 946684800, CALENDAR_STATUS_NOT_SIGNED_UP, CALENDAR_RANK_PLAYER, ""); + CalendarInvite* invite = new CalendarInvite(0, calendarEvent->GetEventId(), 0, guid, 946684800, CALENDAR_STATUS_NOT_SIGNED_UP, CALENDAR_RANK_PLAYER, ""); sCalendarMgr->AddInvite(calendarEvent, invite); } else @@ -445,7 +445,7 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recvData) { if (isGuildEvent && inviteeGuildId == _player->GetGuildId()) { - sCalendarMgr->SendCalendarCommandResult(inviteeGuid, CALENDAR_ERROR_NO_GUILD_INVITES); + sCalendarMgr->SendCalendarCommandResult(playerGuid, CALENDAR_ERROR_NO_GUILD_INVITES); return; } |