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

Merge pull request #13534 from huffman/fix/ess-avatar-entities

Browse source 
Fix crash when editing avatar entities with no myAvatar
This commit is contained in:
John Conklin II 2018-07-25 14:21:12 -07:00 committed by GitHub
commit 21d043d179
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,9 +84,15 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
EntityTreePointer entityTree, EntityTreePointer entityTree,
EntityItemID entityItemID, EntityItemID entityItemID,
const EntityItemProperties& properties) { const EntityItemProperties& properties) {
if (properties.getClientOnly() && properties.getOwningAvatarID() == _myAvatar->getID()) { if (properties.getClientOnly()) {
// this is an avatar-based entity --> update our avatar-data rather than sending to the entity-server if (!_myAvatar) {
queueEditAvatarEntityMessage(type, entityTree, entityItemID, properties); qCWarning(entities) << "Suppressing entity edit message: cannot send clientOnly edit with no myAvatar";
} else if (properties.getOwningAvatarID() == _myAvatar->getID()) {
// this is an avatar-based entity --> update our avatar-data rather than sending to the entity-server
queueEditAvatarEntityMessage(type, entityTree, entityItemID, properties);
} else {
qCWarning(entities) << "Suppressing entity edit message: cannot send clientOnly edit for another avatar";
}
return; return;
} }