Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent 2 avatars from staying seated in the same chair

Browse source
This commit is contained in:
Atlante45 2017-03-17 16:11:17 -07:00
parent 4c75680877
commit eccc9ff47c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/tutorials/entity_scripts/sit.js
View file

@ -156,7 +156,10 @@
MyAvatar.removeAnimationStateHandler(this.animStateHandlerID); MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
Script.update.disconnect(this, this.update); Script.update.disconnect(this, this.update);
this.setSeatUser(null); if (MyAvatar.sessionUUID === this.getSeatUser()) {
this.setSeatUser(null);
}
if (Settings.getValue(SETTING_KEY) === this.entityID) { if (Settings.getValue(SETTING_KEY) === this.entityID) {
Settings.setValue(SETTING_KEY, ""); Settings.setValue(SETTING_KEY, "");
@ -261,6 +264,9 @@
shouldStandUp = true; shouldStandUp = true;
} }
if (MyAvatar.sessionUUID !== this.getSeatUser()) {
shouldStandUp = true;
}
if (shouldStandUp || avatarDistance > RELEASE_DISTANCE) { if (shouldStandUp || avatarDistance > RELEASE_DISTANCE) {
print("IK error: " + ikError + ", distance from chair: " + avatarDistance); print("IK error: " + ikError + ", distance from chair: " + avatarDistance);