From ab32470699bf005e044de8d672cd8540b816481b Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Mon, 12 Oct 2015 09:12:33 -0700
Subject: [PATCH 1/2] Fixed syntax error in hiddenEntityResetScript

---
 unpublishedScripts/hiddenEntityReset.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index d480c0ac74..10966f3a7b 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -407,11 +407,6 @@
         type: 'Box',
         position: startPosition,
         dimensions: TARGET_DIMENSIONS,
-        color: {
-          red: 0,
-          green: 255,
-          blue: 0
-        },
         rotation: rotation,
         visible: false,
         collisionsWillMove: false,
@@ -734,7 +729,6 @@
 
 
 
-
       var sconceLight3 = Entities.addEntity({
         type: "Light",
         position: {
@@ -888,7 +882,7 @@
           y: 1.13,
           z: 0.2
         },
-        rotation: rotation2,
+        rotation: rotation,
         collisionsWillMove: true,
         gravity: {
           x: 0,
@@ -1256,7 +1250,7 @@
           y: 0.05,
           z: 0.25
         }
-      },];
+      }, ];
 
       var modelURL, entity;
       for (i = 0; i < blockTypes.length; i++) {
@@ -1305,7 +1299,6 @@
       Script.scriptEnding.connect(cleanup);
     }
   };
-
   // entity scripts always need to return a newly constructed object of our type
   return new ResetSwitch();
-});
+});
\ No newline at end of file

From 08a94189b73fa64a06746e526fc8de6104eba817 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Mon, 12 Oct 2015 09:31:12 -0700
Subject: [PATCH 2/2] explicitly setting isSpotlight to false

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

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 10966f3a7b..0a678d668e 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -52,7 +52,6 @@
   };
 
 
-
   MasterReset = function() {
     var resetKey = "resetMe";
     var GRABBABLE_DATA_KEY = "grabbableKey";
@@ -653,6 +652,7 @@
           green: 146,
           blue: 24
         },
+        isSpotlight: false,
         userData: JSON.stringify({
           resetMe: {
             resetMe: true,
@@ -680,6 +680,7 @@
           green: 146,
           blue: 24
         },
+        isSpotlight: false,
         userData: JSON.stringify({
           resetMe: {
             resetMe: true,
@@ -749,6 +750,7 @@
           green: 146,
           blue: 24
         },
+        isSpotlight: false,
         userData: JSON.stringify({
           resetMe: {
             resetMe: true,
@@ -777,6 +779,7 @@
           green: 146,
           blue: 24
         },
+        isSpotlight: false,
         userData: JSON.stringify({
           resetMe: {
             resetMe: true,
@@ -804,6 +807,7 @@
           green: 146,
           blue: 24
         },
+        isSpotlight: false,
         userData: JSON.stringify({
           resetMe: {
             resetMe: true,
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 693e2eb28b..d9199a124d 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -625,6 +625,7 @@ MasterReset = function() {
         green: 146,
         blue: 24
       },
+      isSpotlight: false,
       userData: JSON.stringify({
         resetMe: {
           resetMe: true,
@@ -652,6 +653,7 @@ MasterReset = function() {
         green: 146,
         blue: 24
       },
+      isSpotlight: false,
       userData: JSON.stringify({
         resetMe: {
           resetMe: true,
@@ -701,7 +703,6 @@ MasterReset = function() {
 
 
 
-
     var sconceLight3 = Entities.addEntity({
       type: "Light",
       position: {
@@ -722,6 +723,7 @@ MasterReset = function() {
         green: 146,
         blue: 24
       },
+      isSpotlight: false,
       userData: JSON.stringify({
         resetMe: {
           resetMe: true,
@@ -750,6 +752,7 @@ MasterReset = function() {
         green: 146,
         blue: 24
       },
+      isSpotlight: false,
       userData: JSON.stringify({
         resetMe: {
           resetMe: true,
@@ -777,6 +780,7 @@ MasterReset = function() {
         green: 146,
         blue: 24
       },
+      isSpotlight: false,
       userData: JSON.stringify({
         resetMe: {
           resetMe: true,
@@ -1223,7 +1227,7 @@ MasterReset = function() {
         y: 0.05,
         z: 0.25
       }
-    },];
+    }, ];
 
     var modelURL, entity;
     for (i = 0; i < blockTypes.length; i++) {
@@ -1271,4 +1275,4 @@ MasterReset = function() {
 
     Script.scriptEnding.connect(cleanup);
   }
-};
+};
\ No newline at end of file