From b6f1a1b89be33e4c285f8c968178f298706b2b12 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Sat, 16 May 2015 07:34:32 -0700 Subject: [PATCH 1/2] added check to airhockey script so entities that have never been created are not attempting to be deleted --- examples/example/games/airHockey.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/example/games/airHockey.js b/examples/example/games/airHockey.js index ecef697b3e..74e00ed678 100644 --- a/examples/example/games/airHockey.js +++ b/examples/example/games/airHockey.js @@ -103,6 +103,8 @@ var spawnButton = Overlays.addOverlay("image", { + + var floor, edge1, edge2, edge3a, edge3b, edge4a, edge4b, light; var puck; var paddle1, paddle2; @@ -564,6 +566,13 @@ function scriptEnding() { Overlays.deleteOverlay(spawnButton); Overlays.deleteOverlay(deleteButton); + + //We only want to delete everything if we've spawned them first. + //Otherwise we'll throw an error- if we have edge1 we've spawned them all. + if(!edge1){ + return; + } + Entities.editEntity(edge1, { locked: false }); @@ -590,7 +599,6 @@ function scriptEnding() { }); - Entities.deleteEntity(edge1); Entities.deleteEntity(edge2); Entities.deleteEntity(edge3a); From 03a4e085732532fc5d14a88e6cc04c5abce120f6 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Sat, 16 May 2015 07:41:25 -0700 Subject: [PATCH 2/2] deleted unecsesary whitespace --- examples/example/games/airHockey.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/example/games/airHockey.js b/examples/example/games/airHockey.js index 74e00ed678..c0640b8331 100644 --- a/examples/example/games/airHockey.js +++ b/examples/example/games/airHockey.js @@ -103,8 +103,6 @@ var spawnButton = Overlays.addOverlay("image", { - - var floor, edge1, edge2, edge3a, edge3b, edge4a, edge4b, light; var puck; var paddle1, paddle2;