From 584dd4081016ca34b572945129aa08cccd0ae77b Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Thu, 19 Jul 2018 17:02:23 -0700
Subject: [PATCH] Don't have two removes in sticky-object

---
 src/components/sticky-object.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/sticky-object.js b/src/components/sticky-object.js
index 0cf3e3c53..b79fa8017 100644
--- a/src/components/sticky-object.js
+++ b/src/components/sticky-object.js
@@ -33,10 +33,6 @@ AFRAME.registerComponent("sticky-object", {
     this.el.removeEventListener("grab-end", this._onRelease);
   },
 
-  remove() {
-    this.el.removeEventListener("body-loaded", this._onBodyLoaded);
-  },
-
   setLocked(locked) {
     if (this.el.components.networked && !NAF.utils.isMine(this.el)) return;
 
@@ -64,6 +60,7 @@ AFRAME.registerComponent("sticky-object", {
   },
 
   remove() {
+    this.el.removeEventListener("body-loaded", this._onBodyLoaded);
     if (this.stuckTo) {
       const stuckTo = this.stuckTo;
       delete this.stuckTo;
-- 
GitLab