From 2393db5e1212606efac6e76b81fb6e0dcaa5dfe5 Mon Sep 17 00:00:00 2001
From: raveenajain <jain.rav@husky.neu.edu>
Date: Mon, 21 Jan 2019 16:24:32 -0800
Subject: [PATCH] collision logic

---
 interface/src/avatar/MyCharacterController.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/interface/src/avatar/MyCharacterController.cpp b/interface/src/avatar/MyCharacterController.cpp
index 819cb85df8..821b01c2c6 100755
--- a/interface/src/avatar/MyCharacterController.cpp
+++ b/interface/src/avatar/MyCharacterController.cpp
@@ -204,14 +204,12 @@ bool MyCharacterController::testRayShotgun(const glm::vec3& position, const glm:
 
 int32_t MyCharacterController::computeCollisionMask() const {
     int32_t collisionMask = BULLET_COLLISION_MASK_MY_AVATAR; 
-    if (_collisionlessAllowed) {
-        if (_collisionless) {
-            collisionMask = BULLET_COLLISION_MASK_COLLISIONLESS;
-        } if (!_collideWithOtherAvatars) {
-            collisionMask &= ~BULLET_COLLISION_GROUP_OTHER_AVATAR;
-        }
+    if (_collisionless && _collisionlessAllowed) {
+        collisionMask = BULLET_COLLISION_MASK_COLLISIONLESS;
+    } else if (!_collideWithOtherAvatars) {
+        collisionMask &= ~BULLET_COLLISION_GROUP_OTHER_AVATAR;
     }
-    return collisionMask; 
+    return collisionMask;
 }
 
 void MyCharacterController::handleChangedCollisionMask() {