From 5039aff1cdbf2e0135b2bff4007d912529a3e04e Mon Sep 17 00:00:00 2001 From: FileEX Date: Mon, 18 Aug 2025 10:40:59 +0200 Subject: [PATCH] Fix flags order --- Server/mods/deathmatch/logic/CPedSync.cpp | 2 -- .../deathmatch/logic/packets/CPedSyncPacket.cpp | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Server/mods/deathmatch/logic/CPedSync.cpp b/Server/mods/deathmatch/logic/CPedSync.cpp index 42952266cf..47fb5237f5 100644 --- a/Server/mods/deathmatch/logic/CPedSync.cpp +++ b/Server/mods/deathmatch/logic/CPedSync.cpp @@ -287,9 +287,7 @@ void CPedSync::Packet_PedSync(CPedSyncPacket& Packet) pPed->SetInWater(Data.bIsInWater); if (Data.ucFlags & 0x60) - { pPed->SetReloadingWeapon(Data.isReloadingWeapon); - } if (Data.ucFlags & 0x80) pPed->SetAnimationData({}); diff --git a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp index 453da05419..567c0b5ac5 100644 --- a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp @@ -75,16 +75,16 @@ bool CPedSyncPacket::Read(NetBitStreamInterface& BitStream) return false; } - if (ucFlags & 0x60) + // In Water + if (ucFlags & 0x40) { - if (!BitStream.ReadBit(Data.isReloadingWeapon)) + if (!BitStream.ReadBit(Data.bIsInWater)) return false; } - // In Water - if (ucFlags & 0x40) + if (ucFlags & 0x60) { - if (!BitStream.ReadBit(Data.bIsInWater)) + if (!BitStream.ReadBit(Data.isReloadingWeapon)) return false; } @@ -138,10 +138,10 @@ bool CPedSyncPacket::Write(NetBitStreamInterface& BitStream) const if (Data.ucFlags & 0x20) BitStream.WriteBit(Data.bOnFire); - if (Data.ucFlags & 0x60) - BitStream.Write(Data.isReloadingWeapon); if (Data.ucFlags & 0x40) BitStream.Write(Data.bIsInWater); + if (Data.ucFlags & 0x60) + BitStream.Write(Data.isReloadingWeapon); return true; }