From d27d624c3f652011dea0ba4459680154846426e3 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Fri, 22 Feb 2019 18:05:42 -0800
Subject: [PATCH] Don't send a KillAvatar packet on kick
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
---
domain-server/src/DomainServerSettingsManager.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 780fad15f2..4e833f6b77 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -25,13 +25,13 @@
#include <AccountManager.h>
#include <Assignment.h>
+#include <AvatarData.h>
#include <HifiConfigVariantMap.h>
#include <HTTPConnection.h>
#include <NLPacketList.h>
#include <NumericalConstants.h>
#include <SettingHandle.h>
#include <SettingHelpers.h>
-#include <AvatarData.h> //for KillAvatarReason
#include <FingerprintUtils.h>
#include "DomainServerNodeData.h"
@@ -870,14 +870,6 @@ void DomainServerSettingsManager::processNodeKickRequestPacket(QSharedPointer<Re
}
}
- // if we are here, then we kicked them, so send the KillAvatar message
- auto packet = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason), true);
- packet->write(nodeUUID.toRfc4122());
- packet->writePrimitive(KillAvatarReason::NoReason);
-
- // send to avatar mixer, it sends the kill to everyone else
- limitedNodeList->broadcastToNodes(std::move(packet), NodeSet() << NodeType::AvatarMixer);
-
if (newPermissions) {
qDebug() << "Removing connect permission for node" << uuidStringWithoutCurlyBraces(matchingNode->getUUID())
<< "after kick request from" << uuidStringWithoutCurlyBraces(sendingNode->getUUID());