From 5e3479560354cbfb374bcbdf94516af8a5a7bb68 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 12 Jun 2017 18:38:23 -0700 Subject: [PATCH] Fix packet types filtering --- assignment-client/src/avatars/AvatarMixer.cpp | 9 ++++----- assignment-client/src/avatars/AvatarMixerClientData.cpp | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index aae447be60..ab51e00e74 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -76,13 +76,13 @@ void AvatarMixer::handleReplicatedPackets(QSharedPointer messag replicatedNode->setIsUpstream(true); switch (message->getType()) { - case PacketType::AvatarData: + case PacketType::ReplicatedAvatarData: queueIncomingPacket(message, replicatedNode); break; - case PacketType::AvatarIdentity: + case PacketType::ReplicatedAvatarIdentity: handleAvatarIdentityPacket(message, replicatedNode); break; - case PacketType::KillAvatar: + case PacketType::ReplicatedKillAvatar: handleKillAvatarPacket(message, replicatedNode); break; default: @@ -108,7 +108,6 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node replicatedType = PacketType::ReplicatedKillAvatar; break; default: - Q_UNREACHABLE(); return; } @@ -125,7 +124,7 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node packet->write(message.getMessage()); } - nodeList->sendUnreliablePacket(*packet, *node); + nodeList->sendUnreliablePacket(*packet, node->getPublicSocket()); }); } } diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index 41717adeb5..3c9edcd4a5 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -45,6 +45,7 @@ int AvatarMixerClientData::processPackets() { switch (packet->getType()) { case PacketType::AvatarData: + case PacketType::ReplicatedAvatarData: parseData(*packet); break; default: