From 5a8ecdffabbe80e12480a4eaf707e19432db0fea Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Thu, 28 Feb 2019 17:37:56 -0800
Subject: [PATCH] EntityStats can have embedded EntityData

---
 assignment-client/src/avatars/AvatarMixer.cpp       | 13 +++++++++++++
 .../src/avatars/AvatarMixerClientData.cpp           |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 67bc9b4cf7..6384ad2b40 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -976,7 +976,20 @@ void AvatarMixer::handleOctreePacket(QSharedPointer<ReceivedMessage> message, Sh
 
     switch (packetType) {
     case PacketType::OctreeStats:
+    {   // Ignore stats, but may have a different Entity packet appended.
+        OctreeHeadlessViewer::parseOctreeStats(message, senderNode);
+        const auto piggyBackedSizeWithHeader = message->getBytesLeftToRead();
+        if (piggyBackedSizeWithHeader > 0) {
+            // pull out the piggybacked packet and create a new QSharedPointer<NLPacket> for it
+            auto buffer = std::unique_ptr<char[]>(new char[piggyBackedSizeWithHeader]);
+            memcpy(buffer.get(), message->getRawMessage() + message->getPosition(), piggyBackedSizeWithHeader);
+
+            auto newPacket = NLPacket::fromReceivedPacket(std::move(buffer), piggyBackedSizeWithHeader, message->getSenderSockAddr());
+            auto newMessage = QSharedPointer<ReceivedMessage>::create(*newPacket);
+            handleOctreePacket(newMessage, senderNode);
+        }
         break;
+    }
 
     case PacketType::EntityData:
         _entityViewer.processDatagram(*message, senderNode);
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index e24d48a9ed..a63a76829b 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -145,9 +145,9 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message, const SlaveShared
         FindPriorityZone findPriorityZone { newPosition, false } ;
         entityTree.recurseTreeWithOperation(&FindPriorityZone::operation, &findPriorityZone);
         _avatar->setPriorityAvatar(findPriorityZone.isInPriorityZone);
-        //if (findPriorityZone.isInPriorityZone) {
-        //    qCWarning(avatars) << "Avatar" << _avatar->getSessionDisplayName() << "in hero zone";
-        //}
+        if (findPriorityZone.isInPriorityZone) {
+            qCWarning(avatars) << "Avatar" << _avatar->getSessionDisplayName() << "in hero zone";
+        }
 #endif
     }