diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
index f9a65732b..7c5b96665 100644
--- a/src/game/Object/Player.cpp
+++ b/src/game/Object/Player.cpp
@@ -24393,7 +24393,7 @@ void Player::LearnPetTalent(ObjectGuid petGuid, uint32 talentId, uint32 talentRa
 
 void Player::UpdateFallInformationIfNeed(MovementInfo const& minfo, uint16 opcode)
 {
-    if (m_lastFallTime >= minfo.GetFallTime() || m_lastFallZ <= minfo.GetPos()->z || opcode == CMSG_MOVE_FALL_LAND)
+    if (m_lastFallTime >= minfo.GetFallTime() || m_lastFallZ <= minfo.GetPos()->z || opcode == MSG_MOVE_FALL_LAND)
         SetFallInformation(minfo.GetFallTime(), minfo.GetPos()->z);
 }
 
diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp
index 057b05c46..1a247c293 100644
--- a/src/game/Object/Unit.cpp
+++ b/src/game/Object/Unit.cpp
@@ -3328,7 +3328,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* pVictim, WeaponAttackT
     bool from_behind = !pVictim->HasInArc(M_PI_F, this);
 
     if (from_behind)
+    {
         DEBUG_FILTER_LOG(LOG_FILTER_COMBAT, "RollMeleeOutcomeAgainst: attack came from behind.");
+    }
 
     // Dodge chance
 
diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp
index aa7757dcf..88113f551 100644
--- a/src/game/Server/Opcodes.cpp
+++ b/src/game/Server/Opcodes.cpp
@@ -274,7 +274,7 @@ void InitializeOpcodes()
     //OPCODE(MSG_MOVE_TELEPORT_CHEAT,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     OPCODE(CMSG_MOVE_TELEPORT_ACK,                       STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMoveTeleportAckOpcode     );
     //OPCODE(MSG_MOVE_TOGGLE_FALL_LOGGING,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    OPCODE(CMSG_MOVE_FALL_LAND,                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
+    OPCODE(MSG_MOVE_FALL_LAND,                           STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     OPCODE(CMSG_MOVE_START_SWIM,                         STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     OPCODE(CMSG_MOVE_STOP_SWIM,                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     //OPCODE(MSG_MOVE_SET_RUN_SPEED_CHEAT,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h
index 72f05c216..b63a796d6 100644
--- a/src/game/Server/Opcodes.h
+++ b/src/game/Server/Opcodes.h
@@ -267,7 +267,7 @@ enum Opcodes
     MSG_MOVE_TELEPORT_CHEAT                               = 0x10C7,
     CMSG_MOVE_TELEPORT_ACK                                = 0x390C, // 4.3.4 15595
     MSG_MOVE_TOGGLE_FALL_LOGGING                          = 0x10C9,
-    CMSG_MOVE_FALL_LAND                                   = 0x17E9, // 5.4.1 17538
+    MSG_MOVE_FALL_LAND                                    = 0x08FA, // 5.4.8 18414
     CMSG_MOVE_START_SWIM                                  = 0x0FC8, // 5.4.1 17538
     CMSG_MOVE_STOP_SWIM                                   = 0x0FC9, // 5.4.1 17538
     MSG_MOVE_SET_RUN_SPEED_CHEAT                          = 0x10CD,
diff --git a/src/game/WorldHandlers/MovementHandler.cpp b/src/game/WorldHandlers/MovementHandler.cpp
index 39783c574..556f0fe77 100644
--- a/src/game/WorldHandlers/MovementHandler.cpp
+++ b/src/game/WorldHandlers/MovementHandler.cpp
@@ -345,7 +345,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recv_data)
     }
 
     // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map).
-    if (opcode == CMSG_MOVE_FALL_LAND && plMover && !plMover->IsTaxiFlying())
+    if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->IsTaxiFlying())
         plMover->HandleFall(movementInfo);
 
     /* process position-change */
diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h
index b91175bc6..9fbcdcfe7 100644
--- a/src/game/movement/MovementStructures.h
+++ b/src/game/movement/MovementStructures.h
@@ -182,71 +182,75 @@ MovementStatusElements PlayerMoveSequence[] =
 
 MovementStatusElements MovementFallLandSequence[] =
 {
-    MSEPositionX,
     MSEPositionY,
     MSEPositionZ,
-    MSEHasTransportData,
-    MSEGuidBit7,
-    MSEGuidBit1,
-    MSEHasMovementFlags2,
-    MSEGuidBit3,
-    MSEHasSplineElevation,
-    MSEHasOrientation,
-    MSEGuidBit6,
-    MSEHasTimestamp,
-    MSEHasUnknownBit,
-    MSEHasPitch,
-    MSEGuidBit4,
-    MSEHasSpline,
-    MSEGuidBit5,
-    MSEHasMovementFlags,
+    MSEPositionX,
     MSEHasFallData,
-    MSEGuidBit0,
+    MSEHasUnknownBit,
+    MSEHasUnknownBit,
+    MSEHasTimestamp,
+    MSEGuidBit7,
+    MSEHasUnknownBit,
+    MSEHasSplineElevation,
+    MSEGuidBit5,
+    MSEHasPitch,
+    MSEHasMovementFlags2,
     MSEGuidBit2,
+    MSEGuidBit3,
+    MSEGuidBit0,
+    MSEHasOrientation,
+    MSECounterCount,
+    MSEHasMovementFlags,
+    MSEHasUnkTime,
+    MSEGuidBit1,
+    MSEHasTransportData,
+    MSEGuidBit6,
+    MSEGuidBit4,
     MSETransportGuidBit0,
-    MSETransportGuidBit5,
-    MSETransportGuidBit3,
-    MSETransportGuidBit2,
-    MSEHasTransportTime3,
     MSEHasTransportTime2,
-    MSETransportGuidBit6,
-    MSETransportGuidBit4,
+    MSETransportGuidBit3,
+    MSETransportGuidBit5,
     MSETransportGuidBit1,
     MSETransportGuidBit7,
+    MSETransportGuidBit4,
+    MSETransportGuidBit2,
+    MSETransportGuidBit6,
+    MSEHasTransportTime3,
     MSEFlags2,
-    MSEFlags,
     MSEHasFallDirection,
-    MSEGuidByte1,
-    MSEGuidByte7,
+    MSEFlags,
     MSEGuidByte4,
     MSEGuidByte3,
-    MSEGuidByte6,
+    MSEGuidByte7,
     MSEGuidByte0,
     MSEGuidByte2,
     MSEGuidByte5,
-    MSETransportTime,
-    MSETransportPositionZ,
-    MSETransportPositionY,
-    MSETransportPositionX,
-    MSETransportGuidByte5,
-    MSETransportTime3,
-    MSETransportGuidByte1,
-    MSETransportSeat,
-    MSETransportTime2,
+    MSEGuidByte1,
+    MSEGuidByte6,
+    MSEMovementCounter,
+    MSEFallSinAngle,
+    MSEFallHorizontalSpeed,
+    MSEFallCosAngle,
+    MSEFallTime,
+    MSEFallVerticalSpeed,
     MSETransportGuidByte4,
+    MSETransportPositionY,
     MSETransportPositionO,
-    MSETransportGuidByte0,
-    MSETransportGuidByte7,
+    MSETransportPositionZ,
     MSETransportGuidByte3,
     MSETransportGuidByte6,
+    MSETransportTime2,
     MSETransportGuidByte2,
-    MSEFallVerticalSpeed,
-    MSEFallTime,
-    MSEFallCosAngle,
-    MSEFallHorizontalSpeed,
-    MSEFallSinAngle,
-    MSESplineElevation,
+    MSETransportGuidByte1,
+    MSETransportGuidByte5,
+    MSETransportTime3,
+    MSETransportTime,
+    MSETransportPositionX,
+    MSETransportGuidByte7,
+    MSETransportGuidByte0,
+    MSEUnkTime,
     MSETimestamp,
+    MSESplineElevation,
     MSEPitch,
     MSEPositionO,
     MSEEnd,
@@ -2580,7 +2584,7 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode)
             return MovementCastSpellSequence;
         case CMSG_MOVE_CHNG_TRANSPORT:
             return MovementChngTransportSequence;
-        case CMSG_MOVE_FALL_LAND:
+        case MSG_MOVE_FALL_LAND:
             return MovementFallLandSequence;
         case CMSG_MOVE_FALL_RESET:
             return MovementFallResetSequence;