From 9b90c19781f5562dc16deb8ce9df1c58f2b3c69c Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 30 Nov 2015 13:24:33 -0800
Subject: [PATCH] cleanup

---
 unpublishedScripts/hiddenEntityReset.js | 10 +++++-----
 unpublishedScripts/masterReset.js       | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 83c1d63f1b..e50a658fba 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -930,7 +930,7 @@
         }
 
         function createWand(position) {
-            var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
+            var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
             var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
 
             var wand = Entities.addEntity({
@@ -941,7 +941,7 @@
                 position: position,
                 gravity: {
                     x: 0,
-                    y: 0,
+                    y: -9.8,
                     z: 0,
                 },
                 dimensions: {
@@ -954,10 +954,10 @@
                 compoundShapeURL: WAND_COLLISION_SHAPE,
                 script: wandScriptURL,
                 userData: JSON.stringify({
+                    resetMe: {
+                        resetMe: true
+                    },
                     grabbableKey: {
-                        resetMe: {
-                            resetMe: true
-                        },
                         invertSolidWhileHeld: true,
                         spatialKey: {
                             relativePosition: {
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 596cff3d99..108f299ae3 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -912,7 +912,7 @@ MasterReset = function() {
     }
 
     function createWand(position) {
-        var WAND_MODEL = 'http://hifi-public.s3.amazonaws.com/models/bubblewand/wand.fbx';
+        var WAND_MODEL = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand.fbx';
         var WAND_COLLISION_SHAPE = 'http://hifi-content.s3.amazonaws.com/james/bubblewand/wand_collision_hull.obj';
 
         var wand = Entities.addEntity({
@@ -923,7 +923,7 @@ MasterReset = function() {
             position: position,
             gravity: {
                 x: 0,
-                y: 0,
+                y: -9.8,
                 z: 0,
             },
             dimensions: {
@@ -936,10 +936,10 @@ MasterReset = function() {
             compoundShapeURL: WAND_COLLISION_SHAPE,
             script: wandScriptURL,
             userData: JSON.stringify({
+                resetMe: {
+                    resetMe: true
+                },
                 grabbableKey: {
-                    resetMe: {
-                        resetMe: true
-                    },
                     invertSolidWhileHeld: true,
                     spatialKey: {
                         relativePosition: {