Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 17:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

another AVATAR_SELF_ID adjustment

Browse source
This commit is contained in:
Seth Alves 2017-02-03 16:47:03 -08:00 committed by Chris Collins
parent f13fdf2a4c
commit b90d7e2689
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItem.cpp
View file

@ -1828,7 +1828,8 @@ void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask
// "bootstrapping" problem where you can shoot yourself across the room by grabbing something
// and holding it against your own avatar.
QUuid ancestorID = findAncestorOfType(NestableType::Avatar);
if (!ancestorID.isNull() && ancestorID == Physics::getSessionUUID()) {
if (!ancestorID.isNull() &&
(ancestorID == Physics::getSessionUUID() || ancestorID == AVATAR_SELF_ID)) {
userMask &= ~USER_COLLISION_GROUP_MY_AVATAR;
}
}