Better handling of erased lights

This commit is contained in:
Atlante45 2015-03-23 17:26:43 +01:00
parent 30ea2eb722
commit 40ed0146e2

View file

@ -11,7 +11,11 @@
return entityID && entityID.isKnownID;
}
function doesEntityExistNow(entityID) {
return entityID && Entities.getEntityProperties(entityID).isKnownID;
return entityID && getTrueID(entityID).isKnownID;
}
function getTrueID(entityID) {
var properties = Entities.getEntityProperties(entityID);
return { id: properties.id, creatorTokenID: properties.creatorTokenID, isKnownID: properties.isKnownID };
}
function getUserData(entityID) {
var properties = Entities.getEntityProperties(entityID);
@ -96,7 +100,7 @@
if (doesEntityExistNow(this.lightID)) {
if (!didEntityExist(this.lightID)) {
// Light now has an ID, so update it in userData
this.lightID = Entities.identifyEntity(this.lightID);
this.lightID = getTrueID(this.lightID);
userData.lightID = this.lightID;
updateUserData(this.entityID, userData);
}
@ -104,7 +108,7 @@
}
if (doesEntityExistNow(userData.lightID)) {
this.lightID = Entities.identifyEntity(userData.lightID);
this.lightID = getTrueID(userData.lightID);
return;
}