From a689d5200403b5fbc2509b276eefa8e603cbfeb2 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Thu, 5 Jan 2017 13:08:50 -0800
Subject: [PATCH] wrap far trigger too with seated check

---
 scripts/tutorials/entity_scripts/chair.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/tutorials/entity_scripts/chair.js b/scripts/tutorials/entity_scripts/chair.js
index 27646ad744..09c2e283c2 100644
--- a/scripts/tutorials/entity_scripts/chair.js
+++ b/scripts/tutorials/entity_scripts/chair.js
@@ -99,7 +99,6 @@
         var howFar = howFarAway(props.position);
         if ((state === STANDING) && (howFar < sitDistance) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = true;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from being close");
@@ -117,7 +116,6 @@
         props = Entities.getEntityProperties(entity, [ "position", "rotation" ]);
         if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = false;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from mouse click");
@@ -125,11 +123,12 @@
     }
 
     this.startFarTrigger = function() {
+        if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = false;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from far trigger");
+        }
     }
 
     this.checkSettings = function() {