Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 11:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't skip past UUID in identity packets

Browse source
This commit is contained in:
Stephen Birarda 2017-06-14 13:26:23 -07:00
parent c132e29b06
commit 9be016fd3e
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -83,25 +83,10 @@ void AvatarMixer::handleReplicatedPackets(QSharedPointer<ReceivedMessage> messag
auto replicatedNode = addOrUpdateReplicatedNode(nodeID, message->getSenderSockAddr());
// construct a "fake" avatar data received message from the byte array and packet list information
auto originalPacketData = message->getMessage().mid(NUM_BYTES_RFC4122_UUID);
PacketType rewrittenType;
if (message->getType() == PacketType::ReplicatedAvatarIdentity) {
rewrittenType = PacketType::AvatarIdentity;
handleAvatarIdentityPacket(message, replicatedNode);
} else if (message->getType() == PacketType::ReplicatedKillAvatar) {
rewrittenType = PacketType::KillAvatar;
}
auto replicatedMessage = QSharedPointer<ReceivedMessage>::create(originalPacketData, rewrittenType,
versionForPacketType(rewrittenType),
message->getSenderSockAddr(), nodeID);
if (rewrittenType == PacketType::AvatarIdentity) {
handleAvatarIdentityPacket(replicatedMessage, replicatedNode);
} else if (rewrittenType == PacketType::KillAvatar) {
handleKillAvatarPacket(replicatedMessage, replicatedNode);
handleKillAvatarPacket(message, replicatedNode);
}
}
@ -527,6 +512,7 @@ void AvatarMixer::handleAvatarIdentityPacket(QSharedPointer<ReceivedMessage> mes
// parse the identity packet and update the change timestamp if appropriate
AvatarData::Identity identity;
AvatarData::parseAvatarIdentityPacket(message->getMessage(), identity);
bool identityChanged = false;
bool displayNameChanged = false;
avatar.processAvatarIdentity(identity, identityChanged, displayNameChanged);