feat: update version handling for entity particle spin and avatar query conical in NLPacket

This commit is contained in:
MayaTheShy
2025-11-08 18:17:58 -05:00
parent 9d4132fc25
commit a99bfe142b

View File

@@ -361,13 +361,13 @@ static void ensureVersionTable(uint8_t& vAvatarRemoveAttachments,
uint8_t NLPacket::versionForPacketType(PacketType type) { uint8_t NLPacket::versionForPacketType(PacketType type) {
uint8_t vAvatarRemoveAttachments, vAvatarTraitsAck, vEntityLastPacket, uint8_t vAvatarRemoveAttachments, vAvatarTraitsAck, vEntityLastPacket,
vAssetBakingTextureMeta, vEntityScriptClientCallable, vEntityQueryCbor, vEntityParticleSpin, vAssetBakingTextureMeta, vEntityScriptClientCallable, vEntityQueryCbor,
vDomainServerAddedNodeSocketTypes, vDomainListSocketTypes, vDomainListRequestSocketTypes, vAvatarQueryConical, vDomainServerAddedNodeSocketTypes, vDomainListSocketTypes, vDomainListRequestSocketTypes,
vDomainConnectionDeniedExtraInfo, vPingIncludeConnID, vIcePingSendPeerID, vAudioStopInjectors; vDomainConnectionDeniedExtraInfo, vPingIncludeConnID, vIcePingSendPeerID, vAudioStopInjectors;
int numPacketTypes = 106; int numPacketTypes = 106;
ensureVersionTable(vAvatarRemoveAttachments, vAvatarTraitsAck, vEntityLastPacket, ensureVersionTable(vAvatarRemoveAttachments, vAvatarTraitsAck, vEntityLastPacket,
vAssetBakingTextureMeta, vEntityScriptClientCallable, vEntityQueryCbor, vEntityParticleSpin, vAssetBakingTextureMeta, vEntityScriptClientCallable, vEntityQueryCbor,
vDomainServerAddedNodeSocketTypes, vDomainListSocketTypes, vDomainListRequestSocketTypes, vAvatarQueryConical, vDomainServerAddedNodeSocketTypes, vDomainListSocketTypes, vDomainListRequestSocketTypes,
vDomainConnectionDeniedExtraInfo, vPingIncludeConnID, vIcePingSendPeerID, vAudioStopInjectors, vDomainConnectionDeniedExtraInfo, vPingIncludeConnID, vIcePingSendPeerID, vAudioStopInjectors,
numPacketTypes); numPacketTypes);
// Based on Overte's PacketHeaders.cpp versionForPacketType() // Based on Overte's PacketHeaders.cpp versionForPacketType()
@@ -390,8 +390,16 @@ uint8_t NLPacket::versionForPacketType(PacketType type) {
case PacketType::ICEServerPeerInformation: case PacketType::ICEServerPeerInformation:
case PacketType::ICEServerQuery: case PacketType::ICEServerQuery:
return 17; return 17;
case PacketType::ICEServerHeartbeat:
return 18; // ICE server heartbeat signing
case PacketType::ICEServerHeartbeatACK:
return 17;
case PacketType::ICEServerHeartbeatDenied:
return 17;
case PacketType::ICEPing: case PacketType::ICEPing:
return vIcePingSendPeerID; return vIcePingSendPeerID;
case PacketType::ICEPingReply:
return 17;
case PacketType::NodeIgnoreRequest: case PacketType::NodeIgnoreRequest:
return 18; return 18;
case PacketType::DomainServerAddedNode: case PacketType::DomainServerAddedNode:
@@ -404,11 +412,18 @@ uint8_t NLPacket::versionForPacketType(PacketType type) {
return vEntityLastPacket; return vEntityLastPacket;
case PacketType::EntityQuery: case PacketType::EntityQuery:
return vEntityQueryCbor; return vEntityQueryCbor;
case PacketType::EntityQueryInitialResultsComplete:
return vEntityParticleSpin;
case PacketType::AvatarQuery:
return vAvatarQueryConical;
case PacketType::AvatarIdentity: case PacketType::AvatarIdentity:
case PacketType::AvatarData: case PacketType::AvatarData:
case PacketType::BulkAvatarData: case PacketType::BulkAvatarData:
case PacketType::KillAvatar: case PacketType::KillAvatar:
return vAvatarRemoveAttachments; return vAvatarRemoveAttachments;
case PacketType::BulkAvatarTraitsAck:
case PacketType::BulkAvatarTraits:
return vAvatarTraitsAck;
case PacketType::MessagesData: case PacketType::MessagesData:
return 18; // TextOrBinaryData return 18; // TextOrBinaryData
case PacketType::AssetMappingOperation: case PacketType::AssetMappingOperation: