Core/Calendar: Fix crash when deleting an event on the calendar. Should also stop the error message from appearing.

Thanks elecyb
Closes #6570

- Corrected some code from 66d42b4f296fa455bfc96ed6a09e64ed5cc62a9d

2 files changed, 13 insertions, 15 deletions

diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
index cef68891890..62bc0ab3205 100644
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@@ -95,9 +95,9 @@ CalendarEventIdList const& CalendarMgr::GetPlayerEvents(uint64 guid)
 
 CalendarInvite* CalendarMgr::GetInvite(uint64 inviteId)
 {
-    CalendarInviteMap::iterator it = _invites.find(inviteId);
-    if (it != _invites.end())
-        return &(it->second);
+    CalendarInviteMap::iterator itr = _invites.find(inviteId);
+    if (itr != _invites.end())
+        return &(itr->second);
 
     sLog->outError("CalendarMgr::GetInvite: [" UI64FMTD "] not found!", inviteId);
     return NULL;
@@ -105,9 +105,9 @@ CalendarInvite* CalendarMgr::GetInvite(uint64 inviteId)
 
 CalendarEvent* CalendarMgr::GetEvent(uint64 eventId)
 {
-    CalendarEventMap::iterator it = _events.find(eventId);
-    if (it != _events.end())
-        return &(it->second);
+    CalendarEventMap::iterator itr = _events.find(eventId);
+    if (itr != _events.end())
+        return &(itr->second);
 
     sLog->outError("CalendarMgr::GetEvent: [" UI64FMTD "] not found!", eventId);
     return NULL;
@@ -316,11 +316,6 @@ void CalendarMgr::AddAction(CalendarAction const& action)
             if (!calendarEvent)
                 return;
 
-            CalendarInviteIdList const& inviteIds = calendarEvent->GetInviteIdList();
-            for (CalendarInviteIdList::const_iterator it = inviteIds.begin(); it != inviteIds.end(); ++it)
-                if (uint64 invitee = RemoveInvite(*it))
-                    SendCalendarEventRemovedAlert(invitee, *calendarEvent);
-
             RemoveEvent(eventId);
             break;
         }
@@ -464,8 +459,6 @@ bool CalendarMgr::RemoveEvent(uint64 eventId)
         return false;
     }
 
-    _events.erase(itr);
-
     bool val = true;
 
     CalendarInviteIdList const& invites = itr->second.GetInviteIdList();
@@ -474,8 +467,13 @@ bool CalendarMgr::RemoveEvent(uint64 eventId)
         CalendarInvite* invite = GetInvite(*itrInvites);
         if (!invite || !RemovePlayerEvent(invite->GetInvitee(), eventId))
             val = false;
+
+        if (uint64 invitee = RemoveInvite(*itrInvites))
+            SendCalendarEventRemovedAlert(invitee, itr->second);
     }
 
+    _events.erase(itr);
+
     return val;
 }
 
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 9abd39f90ec..a280bc30b7c 100755
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1733,8 +1733,8 @@ void WorldSession::HandleUpdateMissileTrajectory(WorldPacket& recvPacket)
     recvPacket >> moveStop;
 
     Unit* caster = ObjectAccessor::GetUnit(*_player, guid);
-    Spell* spell = caster ? caster->GetCurrentSpell(CURRENT_CHANNELED_SPELL) : NULL;
-    if (!spell || spell->m_spellInfo->Id != spellId || !spell->m_targets.HasDst())
+    Spell* spell = caster ? caster->GetCurrentSpell(CURRENT_GENERIC_SPELL) : NULL;
+    if (!spell || spell->m_spellInfo->Id != spellId || !spell->m_targets.HasDst() || !spell->m_targets.HasSrc())
     {
         recvPacket.rfinish();
         return;