diff options
Diffstat (limited to 'src/server/game/Handlers/CalendarHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/CalendarHandler.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 92cae23e5b2..b5a77dd52e0 100755 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -237,6 +237,7 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket& recv_data) "] differs", guid, inviteCount, invitee); return; } + inviteId = sCalendarMgr->GetFreeInviteId(); } else @@ -386,6 +387,12 @@ void WorldSession::HandleCalendarEventInvite(WorldPacket& recv_data) UI64FMTD "] InviteId [" UI64FMTD "] Name %s ([" UI64FMTD "]), status %u, " "Rank %u", guid, eventId, inviteId, name.c_str(), invitee, status, rank); + if (!invitee) + { + SendCalendarCommandResult(CALENDAR_ERROR_PLAYER_NOT_FOUND); + return; + } + CalendarAction action; action.SetAction(CALENDAR_ACTION_ADD_EVENT_INVITE); action.SetGUID(guid); @@ -817,13 +824,27 @@ void WorldSession::SendCalendarRaidLockoutUpdated(InstanceSave const* save) SendPacket(&data); } -void WorldSession::SendCalendarCommandResult(uint32 value) +void WorldSession::SendCalendarCommandResult(CalendarError err, char const* param /*= NULL*/) { uint64 guid = _player->GetGUID(); - sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_CALENDAR_COMMAND_RESULT [" UI64FMTD "] Value: %u", guid, value); + sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_CALENDAR_COMMAND_RESULT [" UI64FMTD "] Value: %u", guid, err); WorldPacket data(SMSG_CALENDAR_COMMAND_RESULT, 0); - data << uint16(0) << uint32(0) << uint32(value); + data << uint32(0); + data << uint8(0); + switch (err) + { + case CALENDAR_ERROR_OTHER_INVITES_EXCEEDED: + case CALENDAR_ERROR_ALREADY_INVITED_TO_EVENT_S: + case CALENDAR_ERROR_IGNORING_YOU_S: + data << param; + break; + default: + data << uint8(0); + break; + } + + data << uint32(err); SendPacket(&data); } |