Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

1 files changed, 49 insertions, 0 deletions

diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 35872f8c63f..8484ac52d27 100755
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -51,6 +51,7 @@
 #include "GameObjectAI.h"
 #include "Group.h"
 #include "AccountMgr.h"
+#include "Spell.h"
 
 void WorldSession::HandleRepopRequestOpcode(WorldPacket & recv_data)
 {
@@ -429,6 +430,10 @@ void WorldSession::HandleLogoutCancelOpcode(WorldPacket & /*recv_data*/)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_LOGOUT_CANCEL Message");
 
+    // Player have already logged out serverside, too late to cancel
+    if (!GetPlayer())
+        return;
+
     LogoutRequest(0);
 
     WorldPacket data(SMSG_LOGOUT_CANCEL_ACK, 0);
@@ -1714,3 +1719,47 @@ void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
 
     _player->SetPendingBind(0, 0);
 }
+
+void WorldSession::HandleUpdateMissileTrajectory(WorldPacket& recvPacket)
+{
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_UPDATE_MISSILE_TRAJECTORY");
+
+    uint64 guid;
+    uint32 spellId;
+    float elevation, speed;
+    float curX, curY, curZ;
+    float targetX, targetY, targetZ;
+    uint8 moveStop;
+
+    recvPacket >> guid >> spellId >> elevation >> speed;
+    recvPacket >> curX >> curY >> curZ;
+    recvPacket >> targetX >> targetY >> targetZ;
+    recvPacket >> moveStop;
+
+    Unit* caster = ObjectAccessor::GetUnit(*_player, guid);
+    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;
+    }
+
+    Position pos = *spell->m_targets.GetSrcPos();
+    pos.Relocate(curX, curY, curZ);
+    spell->m_targets.ModSrc(pos);
+
+    pos = *spell->m_targets.GetDstPos();
+    pos.Relocate(targetX, targetY, targetZ);
+    spell->m_targets.ModDst(pos);
+
+    spell->m_targets.SetElevation(elevation);
+    spell->m_targets.SetSpeed(speed);
+
+    if (moveStop)
+    {
+        uint32 opcode;
+        recvPacket >> opcode;
+        recvPacket.SetOpcode(opcode);
+        HandleMovementOpcodes(recvPacket);
+    }
+}