Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 07:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

adjust client to only delete entities on server echo

Browse source
This commit is contained in:
ZappoMan 2018-01-26 14:57:36 -08:00
parent 6192625942
commit aa82ad8855
2 changed files with 12 additions and 5 deletions

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -585,7 +585,10 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
if (entity->getLocked()) {
shouldDelete = false;
} else {
_entityTree->deleteEntity(entityID);
// only delete local entities, server entities will round trip through the server filters
if (entity->getClientOnly()) {
_entityTree->deleteEntity(entityID);
}
}
}
});

12
libraries/entities/src/EntityTree.cpp
View file

@ -1946,12 +1946,16 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
_totalFilterTime += endFilter - startFilter;
entityItemIDsToDelete << entityItemID;
if (wantEditLogging() || wantTerseEditLogging()) {
qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
if (allowed) {
entityItemIDsToDelete << entityItemID;
if (wantEditLogging() || wantTerseEditLogging()) {
qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
}
} else if (wantEditLogging() || wantTerseEditLogging()) {
qCDebug(entities) << "User [" << sourceNode->getUUID() << "] attempted to deleteentity. ID:" << entityItemID << " Filter rejected erase.";
}
}
deleteEntities(entityItemIDsToDelete, true, true);
}