Movement: Implement unit based SMSG_MOVE_SET_COLLISION_HGT and MSG_MO…

…VE_SET_COLLISION_HGT sending
cmangos · Aug 17, 2021 · 4700175 · 4700175
1 parent 7af726c
commit 4700175
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -12834,13 +12834,16 @@ void Unit::DisableSpline()
 
 void Unit::SendCollisionHeightUpdate(float height)
 {
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (IsClientControlled())
     {
-        WorldPacket data(SMSG_MOVE_SET_COLLISION_HGT, GetPackGUID().size() + 4 + 4);
-        data << GetPackGUID();
-        data << uint32(sWorld.GetGameTime());
-        data << height;
-        ((Player*)this)->GetSession()->SendPacket(data);
+        if (Player const* player = GetControllingPlayer())
+        {
+            WorldPacket data(SMSG_MOVE_SET_COLLISION_HGT, GetPackGUID().size() + 4 + 4);
+            data << GetPackGUID();
+            data << uint32(sWorld.GetGameTime());
+            data << height;
+            player->GetSession()->SendPacket(data);
+        }
     }
 }
 

diff --git a/src/game/MotionGenerators/MovementHandler.cpp b/src/game/MotionGenerators/MovementHandler.cpp
@@ -348,9 +348,18 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket& recv_data)
         return;
     }
 
+    Unit* mover = _player->GetMover();
+
+    if (!ProcessMovementInfo(movementInfo, mover, _player, recv_data))
+        return;
+
     if (opcode == CMSG_MOVE_SET_COLLISION_HGT_ACK)
     {
-        // TODO: Send MSG_MOVE_SET_COLLISION_HGT
+        WorldPacket data(MSG_MOVE_SET_COLLISION_HGT, 18);
+        data << guid.WriteAsPacked();
+        data << movementInfo;
+        data << newspeed; // new collision height
+        mover->SendMessageToSetExcept(data, _player);
         return;
     }
 
@@ -379,11 +388,6 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket& recv_data)
             return;
     }
 
-    Unit* mover = _player->GetMover();
-
-    if (!ProcessMovementInfo(movementInfo, mover, _player, recv_data))
-        return;
-
     const SpeedOpcodePair& speedOpcodes = SetSpeed2Opc_table[move_type];
     WorldPacket data(speedOpcodes[2], 18);
     data << guid.WriteAsPacked();