update to 1.17.1 and minor fixes

This commit is contained in:
Andrew So 2021-12-10 14:53:18 -08:00
parent 99a97df753
commit c04e831e19
5 changed files with 12 additions and 8 deletions

View File

@ -461,6 +461,7 @@ KNOWN_MINECRAFT_VERSION_RECORDS = [
Version('20w46a', PRE | 6, True),
Version('20w48a', PRE | 7, True),
Version('1.17', 755, True),
Version('1.17.1', 756, True),
]
# An OrderedDict mapping the id string of each known Minecraft version to its

View File

@ -150,7 +150,7 @@ class SetCompressionPacket(Packet):
def get_id(context):
return 0x03 if context.protocol_later_eq(755) else \
0x46
packet_name = "set compression"
definition = [
{'threshold': VarInt}]
@ -374,7 +374,6 @@ class EntityLookPacket(Packet):
{'on_ground': Boolean}
]
class ResourcePackSendPacket(Packet):
@staticmethod
def get_id(context):
@ -384,5 +383,7 @@ class ResourcePackSendPacket(Packet):
packet_name = "resource pack send"
definition = [
{"url": String},
{"hash": String}
]
{"hash": String},
{"forced": Boolean},
{"forced_message": String}
]

View File

@ -101,7 +101,10 @@ class MapPacket(Packet):
icon = MapPacket.MapIcon(type, direction, (x, z), display_name)
self.icons.append(icon)
self.width = UnsignedByte.read(file_object)
try:
self.width = UnsignedByte.read(file_object)
except:
self.width = None
if self.width:
self.height = UnsignedByte.read(file_object)
x = Byte.read(file_object)

View File

@ -34,7 +34,7 @@ class PlayerPositionAndLookPacket(Packet, BitFieldEnum):
{'pitch': Float},
{'flags': Byte},
{'teleport_id': VarInt} if context.protocol_later_eq(107) else {},
{'dismount_vehicle': Boolean} if context.protocol_later_eq(755) else {},
{'dismount_vehicle':Boolean} if context.protocol_later_eq(755) else {},
])
# Access the 'x', 'y', 'z' fields as a Vector tuple.

View File

@ -268,7 +268,6 @@ class UseItemPacket(Packet):
Hand = RelativeHand
class ResourcePackStatusPacket(Packet):
@staticmethod
def get_id(context):
@ -276,4 +275,4 @@ class ResourcePackStatusPacket(Packet):
packet_name = "resource pask status"
definition = [
{"result": VarInt}
]
]