From eccc9ff47c30c7782d51a9ae14a8dbbac0479083 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 17 Mar 2017 16:11:17 -0700 Subject: [PATCH] Prevent 2 avatars from staying seated in the same chair --- scripts/tutorials/entity_scripts/sit.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js index 82a6ab06a4..f03bc4fa50 100644 --- a/scripts/tutorials/entity_scripts/sit.js +++ b/scripts/tutorials/entity_scripts/sit.js @@ -156,7 +156,10 @@ MyAvatar.removeAnimationStateHandler(this.animStateHandlerID); Script.update.disconnect(this, this.update); - this.setSeatUser(null); + if (MyAvatar.sessionUUID === this.getSeatUser()) { + this.setSeatUser(null); + } + if (Settings.getValue(SETTING_KEY) === this.entityID) { Settings.setValue(SETTING_KEY, ""); @@ -261,6 +264,9 @@ shouldStandUp = true; } + if (MyAvatar.sessionUUID !== this.getSeatUser()) { + shouldStandUp = true; + } if (shouldStandUp || avatarDistance > RELEASE_DISTANCE) { print("IK error: " + ikError + ", distance from chair: " + avatarDistance);