alemi/aiocraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: double implementation for position type

Browse source
This commit is contained in:
əlemi 2023-03-13 23:04:49 +01:00
parent 152dda2f2c
commit 9928ea7a46
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aiocraft/mc/types.py
View file

@ -216,20 +216,32 @@ class PositionType(Type):
pytype : type = tuple pytype : type = tuple
MAX_SIZE : int = 8 MAX_SIZE : int = 8
# TODO THIS IS FOR 1.12.2!!! Make a generic version-less?
def write(self, data:tuple, buffer:io.BytesIO, ctx:Context): def write(self, data:tuple, buffer:io.BytesIO, ctx:Context):
if ctx._proto <= 441:
packed = ((0x3FFFFFF & data[0]) << 38) \ packed = ((0x3FFFFFF & data[0]) << 38) \
| ((0xFFF & data[1]) << 26) \ | ((0xFFF & data[1]) << 26) \
| (0x3FFFFFF & data[2]) | (0x3FFFFFF & data[2])
UnsignedLong.write(packed, buffer, ctx=ctx) UnsignedLong.write(packed, buffer, ctx=ctx)
else:
packed = ((0x3FFFFFF & data[0]) << 38) \
| ((0xFFF & data[2]) << 12) \
| (0x3FFFFFF & data[1])
UnsignedLong.write(packed, buffer, ctx=ctx)
pass
def read(self, buffer:io.BytesIO, ctx:Context) -> tuple: def read(self, buffer:io.BytesIO, ctx:Context) -> tuple:
if ctx._proto <= 441:
packed = UnsignedLong.read(buffer, ctx) packed = UnsignedLong.read(buffer, ctx)
x = twos_comp(packed >> 38, 26) x = twos_comp(packed >> 38, 26)
y = (packed >> 26) & 0xFFF y = (packed >> 26) & 0xFFF
z = twos_comp(packed & 0x3FFFFFF, 26) z = twos_comp(packed & 0x3FFFFFF, 26)
return (x, y, z) return (x, y, z)
else:
packed = UnsignedLong.read(buffer, ctx)
x = twos_comp(packed >> 38, 26)
z = twos_comp((packed >> 12) & 0x3FFFFFF, 26)
y = packed & 0xFFF
return (x, y, z)
Position = PositionType() Position = PositionType()