Core/Protocol: Fix struct and make use of CMSG_UPDATE_PROJECTILE_POSITION.

2 files changed, 12 insertions, 3 deletions

diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index b2d52c85467..1affdf0aff7 100755
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -650,13 +650,22 @@ void WorldSession::HandleUpdateProjectilePosition(WorldPacket& recvPacket)
     uint8 castCount;
     float x, y, z;    // Position of missile hit
 
-    recvPacket.readPackGUID(casterGuid);
+    recvPacket >> casterGuid;
     recvPacket >> spellId;
     recvPacket >> castCount;
     recvPacket >> x;
     recvPacket >> y;
     recvPacket >> z;
 
+    Unit* caster = ObjectAccessor::GetUnit(*_player, casterGuid);
+    Spell* spell = caster ? caster->FindCurrentSpellBySpellId(spellId) : NULL;
+    if (spell && spell->m_targets.HasDst())
+    {
+        Position pos = *spell->m_targets.GetDstPos();
+        pos.Relocate(x, y, z);
+        spell->m_targets.ModDst(pos);
+    }
+
     WorldPacket data(SMSG_SET_PROJECTILE_POSITION, 21);
     data << uint64(casterGuid);
     data << uint8(castCount);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 3c77ced6741..d76a0ab8dd4 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -1248,8 +1248,8 @@ enum Opcodes
     SMSG_CALENDAR_CLEAR_PENDING_ACTION              = 0x4BB,
     SMSG_EQUIPMENT_SET_LIST                         = 0x4BC, // equipment manager list?
     CMSG_EQUIPMENT_SET_SAVE                         = 0x4BD,
-    CMSG_UPDATE_PROJECTILE_POSITION                 = 0x4BE, // uint64 caster, uint32 spellId, uint8 castId, vector3 position
-    SMSG_SET_PROJECTILE_POSITION                    = 0x4BF, // uint64 caster, uint8 castId, vector3 position
+    CMSG_UPDATE_PROJECTILE_POSITION                 = 0x4BE,
+    SMSG_SET_PROJECTILE_POSITION                    = 0x4BF,
     SMSG_TALENTS_INFO                               = 0x4C0,
     CMSG_LEARN_PREVIEW_TALENTS                      = 0x4C1,
     CMSG_LEARN_PREVIEW_TALENTS_PET                  = 0x4C2,