Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure kill packet has node ID

Browse source
This commit is contained in:
Stephen Birarda 2017-06-14 11:26:33 -07:00
parent b7d8c173c1
commit 6fc1045ee9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,6 +150,13 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node
if (!packet) { if (!packet) {
// construct an NLPacket to send to the replicant that has the contents of the received packet // construct an NLPacket to send to the replicant that has the contents of the received packet
packet = NLPacket::create(replicatedType, message.getSize()); packet = NLPacket::create(replicatedType, message.getSize());
if (message.getType() == PacketType::KillAvatar) {
// this was not a replicated packet originally, we need to prepend the session ID
// for the killed node
packet->write(node->getUUID().toRfc4122());
}
packet->write(message.getMessage()); packet->write(message.getMessage());
} }
@ -541,8 +548,6 @@ void AvatarMixer::handleAvatarIdentityPacket(QSharedPointer<ReceivedMessage> mes
} }
auto end = usecTimestampNow(); auto end = usecTimestampNow();
_handleAvatarIdentityPacketElapsedTime += (end - start); _handleAvatarIdentityPacketElapsedTime += (end - start);
optionallyReplicatePacket(*message, *senderNode);
} }
void AvatarMixer::handleKillAvatarPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) { void AvatarMixer::handleKillAvatarPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {