From b8f1c966852d5dfaf3e6ca1083aabcafcf768e96 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 25 Oct 2018 07:46:46 -0700
Subject: [PATCH] rats

---
 .../controllerModules/equipEntity.js          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js
index 9a78c706a9..2f343ff84b 100644
--- a/scripts/system/controllers/controllerModules/equipEntity.js
+++ b/scripts/system/controllers/controllerModules/equipEntity.js
@@ -189,15 +189,19 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
     var UNEQUIP_KEY = "u";
 
     function getWearableData(props) {
-        return {
-            joints: {
-                LeftHand: [ props.grab.equippableLeftPosition, props.grab.equippableLeftRotation ],
-                RightHand: [ props.grab.equippableRightPosition, props.grab.equippableRightRotation ]
-            },
-            indicatorURL: props.grab.equippableIndicatorURL,
-            indicatorScale: props.grab.equippableIndicatorScale,
-            indicatorOffset: props.grab.equippableIndicatorOffset
-        };
+        if (props.grab.equippable) {
+            return {
+                joints: {
+                    LeftHand: [ props.grab.equippableLeftPosition, props.grab.equippableLeftRotation ],
+                    RightHand: [ props.grab.equippableRightPosition, props.grab.equippableRightRotation ]
+                },
+                indicatorURL: props.grab.equippableIndicatorURL,
+                indicatorScale: props.grab.equippableIndicatorScale,
+                indicatorOffset: props.grab.equippableIndicatorOffset
+            };
+        } else {
+            return null
+        }
     }
 
     function getAttachPointSettings() {