Core/PacketIO: Fixed starting spline movement with 0 length segments

1 files changed, 2 insertions, 4 deletions

diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index 0270526576b..f0eecb3a16d 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -277,10 +277,10 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(::
     else
         data << G3D::Vector3::zero();
 
-    data.WriteBit(!moveSpline.Finalized());
+    bool hasSplineMove = data.WriteBit(!moveSpline.Finalized() && !moveSpline.splineIsFacingOnly);
     data.FlushBits();
 
-    if (!moveSpline.Finalized())                                                // MovementSplineMove
+    if (hasSplineMove)                                                          // MovementSplineMove
     {
         ::Movement::MoveSplineFlag const& splineFlags = moveSpline.splineflags;
 
@@ -348,8 +348,6 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(::
         //    data << uint32();
         //}
     }
-    else
-        data.FlushBits();
 }
 
 void WorldPackets::Movement::MonsterMove::InitializeSplineData(::Movement::MoveSpline const& moveSpline)