backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #144 from MathiewMay/dev

Browse source 
Fixed packet desync caused by entity ID overflowing
This commit is contained in:
ThePixelMoon 2026-03-09 22:26:55 +02:00 committed by GitHub
parent 4ecafd754b 9c254bbf4d
commit 17e113f292
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.World/Network/Packets/SetEntityMotionPacket.cpp
View file

@ -73,18 +73,20 @@ void SetEntityMotionPacket::read(DataInputStream *dis) //throws IOException
} }
} }
void SetEntityMotionPacket::write(DataOutputStream *dos) //throws IOException void SetEntityMotionPacket::write(DataOutputStream *dos) //throws IOException
{ {
if( useBytes ) if( useBytes )
{ {
dos->writeShort(id | 0x800); // Masking the id to 11 bits before writing to account for large entitty ids.
dos->writeShort((id & 0x07FF) | 0x800);
dos->writeByte(xa/16); dos->writeByte(xa/16);
dos->writeByte(ya/16); dos->writeByte(ya/16);
dos->writeByte(za/16); dos->writeByte(za/16);
} }
else else
{ {
dos->writeShort(id); // same thing as line 80 here
dos->writeShort((id & 0x07FF));
dos->writeShort(xa); dos->writeShort(xa);
dos->writeShort(ya); dos->writeShort(ya);
dos->writeShort(za); dos->writeShort(za);