diff options
-rw-r--r-- | src/server/game/Handlers/SpellHandler.cpp | 8 | ||||
-rw-r--r-- | src/server/game/Server/Packets/SpellPackets.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Server/Packets/SpellPackets.h | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 6599364a9c4..bbce8bbd8ed 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -573,15 +573,15 @@ void WorldSession::HandleMissileTrajectoryCollision(WorldPackets::Spells::Missil return; Position pos = *spell->m_targets.GetDstPos(); - pos.Relocate(packet.CollisionPos.x, packet.CollisionPos.y, packet.CollisionPos.z); + pos.Relocate(packet.CollisionPos); spell->m_targets.ModDst(pos); WorldPacket data(SMSG_NOTIFY_MISSILE_TRAJECTORY_COLLISION, 21); data << packet.Target; data << uint8(packet.CastID); - data << float(packet.CollisionPos.x); - data << float(packet.CollisionPos.y); - data << float(packet.CollisionPos.z); + data << float(packet.CollisionPos.m_positionX); + data << float(packet.CollisionPos.m_positionY); + data << float(packet.CollisionPos.m_positionZ); caster->SendMessageToSet(&data, true); } diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp index c5edf1e40c3..a54448e455f 100644 --- a/src/server/game/Server/Packets/SpellPackets.cpp +++ b/src/server/game/Server/Packets/SpellPackets.cpp @@ -805,5 +805,5 @@ void WorldPackets::Spells::MissileTrajectoryCollision::Read() _worldPacket >> Target; _worldPacket >> SpellID; _worldPacket >> CastID; - _worldPacket >> CollisionPos; + _worldPacket >> CollisionPos.PositionXYZStream(); } diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 76f60f83528..50ab5ffdf11 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -19,7 +19,6 @@ #define SpellPackets_h__ #include "Packet.h" -#include "PacketUtilities.h" #include "Player.h" #include "SpellAuras.h" #include "Spell.h" @@ -836,7 +835,7 @@ namespace WorldPackets ObjectGuid Target; int32 SpellID = 0; uint8 CastID = 0; - G3D::Vector3 CollisionPos; + Position CollisionPos; }; } } |