Core/PacketIO: Updated spell packets

2 files changed, 8 insertions, 21 deletions

diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index 832dfc82b06..e8a1c2ff5cd 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -188,8 +188,10 @@ ByteBuffer& operator>>(ByteBuffer& buffer, WorldPackets::Spells::MissileTrajecto
 ByteBuffer& operator>>(ByteBuffer& buffer, WorldPackets::Spells::SpellCastRequest& request)
 {
     buffer >> request.CastID;
+    buffer >> request.Misc[0];
+    buffer >> request.Misc[1];
     buffer >> request.SpellID;
-    buffer >> request.Misc;
+    buffer >> request.SpellXSpellVisualID;
     buffer >> request.Target;
     buffer >> request.MissileTrajectory;
     buffer >> request.Charmer;
@@ -228,7 +230,6 @@ void WorldPackets::Spells::PetCastSpell::Read()
     _worldPacket >> Cast;
 }
 
-
 void WorldPackets::Spells::UseItem::Read()
 {
     _worldPacket >> PackSlot;
@@ -315,13 +316,6 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Spells::SpellAmmo const&
     return data;
 }
 
-ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Spells::ProjectileVisualData const& projectileVisual)
-{
-    data << int32(projectileVisual.ID[0]);
-    data << int32(projectileVisual.ID[1]);
-    return data;
-}
-
 ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Spells::CreatureImmunities const& immunities)
 {
     data << int32(immunities.School);
@@ -343,6 +337,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Spells::SpellCastData con
     data << spellCastData.CasterUnit;
     data << uint8(spellCastData.CastID);
     data << int32(spellCastData.SpellID);
+    data << uint32(spellCastData.SpellXSpellVisualID);
     data << uint32(spellCastData.CastFlags);
     data << uint32(spellCastData.CastTime);
     data << uint32(spellCastData.HitTargets.size());
@@ -372,17 +367,13 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Spells::SpellCastData con
     for (WorldPackets::Spells::TargetLocation const& targetLoc : spellCastData.TargetPoints)
         data << targetLoc;
 
-    data.WriteBits(spellCastData.CastFlagsEx, 18);
+    data.WriteBits(spellCastData.CastFlagsEx, 20);
     data.WriteBit(spellCastData.RemainingRunes.is_initialized());
-    data.WriteBit(spellCastData.ProjectileVisual.is_initialized());
     data.FlushBits();
 
     if (spellCastData.RemainingRunes)
         data << *spellCastData.RemainingRunes;
 
-    if (spellCastData.ProjectileVisual)
-        data << *spellCastData.ProjectileVisual;
-
     return data;
 }
 
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index a3fa6c10925..ea112a0764e 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -213,13 +213,14 @@ namespace WorldPackets
         {
             uint8 CastID = 0;
             int32 SpellID = 0;
-            int32 Misc = 0;
+            uint32 SpellXSpellVisualID = 0;
             uint8 SendCastFlags = 0;
             SpellTargetData Target;
             MissileTrajectoryRequest MissileTrajectory;
             Optional<MovementInfo> MoveUpdate;
             std::vector<SpellWeight> Weight;
             ObjectGuid Charmer;
+            int32 Misc[2] = { };
         };
 
         class CastSpell final : public ClientPacket
@@ -287,11 +288,6 @@ namespace WorldPackets
             int8 InventoryType = 0;
         };
 
-        struct ProjectileVisualData
-        {
-            int32 ID[2];
-        };
-
         struct CreatureImmunities
         {
             uint32 School = 0;
@@ -311,6 +307,7 @@ namespace WorldPackets
             ObjectGuid CasterUnit;
             uint8 CastID        = 0;
             int32 SpellID       = 0;
+            uint32 SpellXSpellVisualID = 0;
             uint32 CastFlags    = 0;
             uint32 CastFlagsEx  = 0;
             uint32 CastTime     = 0;
@@ -322,7 +319,6 @@ namespace WorldPackets
             Optional<RuneData> RemainingRunes;
             MissileTrajectoryResult MissileTrajectory;
             SpellAmmo Ammo;
-            Optional<ProjectileVisualData> ProjectileVisual;
             uint8 DestLocSpellCastIndex = 0;
             std::vector<TargetLocation> TargetPoints;
             CreatureImmunities Immunities;