From 7ca7e0f2345744c86af72805dece85de57744935 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 3 Jan 2019 13:45:00 -0800
Subject: [PATCH] Revert unintended changes in avatar packager

---
 interface/src/Application.cpp              | 2 +-
 interface/src/avatar/AvatarManager.cpp     | 4 ++--
 scripts/system/html/js/entityProperties.js | 9 ---------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b8324874b1..a0edc7f5ff 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -466,7 +466,7 @@ public:
                 // Don't actually crash in debug builds, in case this apparent deadlock is simply from
                 // the developer actively debugging code
                 #ifdef NDEBUG
-                //deadlockDetectionCrash();
+                deadlockDetectionCrash();
                 #endif
             }
         }
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 1a6b510ea1..7ca18ca258 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -536,7 +536,6 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
         // my avatar. (Other user machines will make a similar analysis and inject sound for their collisions.)
         if (collision.idA.isNull() || collision.idB.isNull()) {
             auto myAvatar = getMyAvatar();
-            myAvatar->collisionWithEntity(collision);
             auto collisionSound = myAvatar->getCollisionSound();
             if (collisionSound) {
                 const auto characterController = myAvatar->getCharacterController();
@@ -572,8 +571,9 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
                     auto injector = AudioInjector::playSoundAndDelete(collisionSound, options);
                     _collisionInjectors.emplace_back(injector);
                 }
+                myAvatar->collisionWithEntity(collision);
+                return;
             }
-            return;
         }
     }
 }
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index d4b60f1814..78ef8ac313 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -112,15 +112,6 @@ const GROUPS = [
                 type: "color",
                 propertyID: "color",
             },
-            {
-                label: "Alpha",
-                type: "",
-                type: "number",
-                min: 0,
-                max: 1,
-                step: 0.001,
-                propertyID: "alpha",
-            },
         ]
     },
     {