From 58c232529b6f93ed9f3010a2e45c7431bb3aa153 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 30 Nov 2016 13:26:56 -0800 Subject: [PATCH] Add back manipulation of collidesWith in bow --- bow/bow/bow.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bow/bow/bow.js b/bow/bow/bow.js index b50a055c9c..c64787c53d 100644 --- a/bow/bow/bow.js +++ b/bow/bow/bow.js @@ -142,6 +142,9 @@ } else if (this.hand === 'right') { this.getStringHandPosition = function() { return _this.getControllerLocation("left").position; }; } + Entities.editEntity(_this.entityID, { + collidesWith: "", + }); var data = getEntityCustomData('grabbableKey', this.entityID, {}); data.grabbable = false; @@ -175,6 +178,9 @@ Entities.deleteEntity(this.arrow); this.resetStringToIdlePosition(); this.destroyArrow(); + Entities.editEntity(_this.entityID, { + collidesWith: "static,dynamic,kinematic,otherAvatar,myAvatar" + }); }, destroyArrow: function() {