mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-18 08:22:54 +00:00
Merge branch '4jcraft:dev' into dev
This commit is contained in:
commit
10ee2085ff
|
|
@ -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 )
|
||||
{
|
||||
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(ya/16);
|
||||
dos->writeByte(za/16);
|
||||
}
|
||||
else
|
||||
{
|
||||
dos->writeShort(id);
|
||||
// same thing as line 80 here
|
||||
dos->writeShort((id & 0x07FF));
|
||||
dos->writeShort(xa);
|
||||
dos->writeShort(ya);
|
||||
dos->writeShort(za);
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ src_assets = Path(project_source_root / "Minecraft.Assets")
|
|||
|
||||
# clear out any old assets
|
||||
if dest_common.exists():
|
||||
shutil.rmtree(dest_common)
|
||||
shutil.rmtree(client_build_dir / "music")
|
||||
shutil.rmtree(client_build_dir / "Sound")
|
||||
shutil.rmtree(dest_common, ignore_errors=True)
|
||||
shutil.rmtree(client_build_dir / "music", ignore_errors=True)
|
||||
shutil.rmtree(client_build_dir / "Sound", ignore_errors=True)
|
||||
# XXX: Check "copy DLC" bellow for info
|
||||
# shutil.rmtree(client_build_dir / "DurangoMedia")
|
||||
# shutil.rmtree(client_build_dir / "DurangoMedia", ignore_errors=True)
|
||||
|
||||
# copy `Minecraft.Assets/Common` into the build directory for the client.
|
||||
shutil.copytree(
|
||||
|
|
|
|||
Loading…
Reference in a new issue