Merge branch 'master' of https://github.com/makitsune/hifi-things

makidoll · Apr 23, 2019 · 1842d7e · 1842d7e
2 parents 0fa061e + ce3e403
commit 1842d7e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/client-scripts/makisPrettyNametags/makisLittlefoxNametags.js b/client-scripts/makisPrettyNametags/makisLittlefoxNametags.js
@@ -28,7 +28,8 @@ function updateNametagEntity(nametag) {
 			"?username="+(nametag.username||"anonymous")+
 			"&avatarURL="+nametag.avatarURL+
 			"&connection="+nametag.connection+
-			"&admin="+nametag.admin
+			"&admin="+nametag.admin+
+			"&theme=littlefox"
 		),
 	});
 }
@@ -82,15 +83,19 @@ function updateNametag(nametag, details) {
 	if (updated) updateNametagEntity(nametag);
 }
 
+function deleteNametag(id) {
+	Entities.deleteEntity(nametags[id].entity);
+	delete nametags[id];
+}
+
 function updateUserLocal(id) {
 	var localUser = AvatarList.getAvatar(id);
 	var nametag = nametags[id];
 
 	if (localUser.sessionUUID == null) {
 		if (nametag==undefined) return; // doesnt exist
 		// must have left
-		Entities.deleteEntity(nametag.entity);
-		delete nametag;
+		deleteNametag(id);
 		return;
 	}
 
@@ -173,6 +178,12 @@ function avatarRemovedEvent(id) {
 	gracefullyUpdateUsersAPI();
 }
 
+function hostChanged() {
+	Object.keys(nametags).forEach(function(id) {
+		deleteNametag(id);
+	});
+}
+
 function usernameFromIDReply(id, username, machineFingerprint, isAdmin) {
 	var nametag = nametags[id];
 	if (nametag==undefined) return;
@@ -197,7 +208,7 @@ var updateIntervalAPI = Script.setInterval(function() {
 AvatarList.avatarAddedEvent.connect(avatarAddedEvent);
 AvatarList.avatarRemovedEvent.connect(avatarRemovedEvent);
 // AvatarList.avatarSessionChangedEvent.connect(avatarSessionChangedEvent);
-
+location.hostChanged.connect(hostChanged);
 Users.usernameFromIDReply.connect(usernameFromIDReply);
 
 Script.scriptEnding.connect(function() {
@@ -207,7 +218,7 @@ Script.scriptEnding.connect(function() {
 	AvatarList.avatarAddedEvent.disconnect(avatarAddedEvent);
 	AvatarList.avatarRemovedEvent.disconnect(avatarRemovedEvent);
 	// AvatarList.avatarSessionChangedEvent.disconnect(avatarSessionChangedEvent);
-
+	location.hostChanged.disconnect(hostChanged);
 	Users.usernameFromIDReply.disconnect(usernameFromIDReply);
 
 	Object.keys(nametags).forEach(function(id) {

diff --git a/client-scripts/makisPrettyNametags/makisPrettyNametags.js b/client-scripts/makisPrettyNametags/makisPrettyNametags.js
@@ -82,15 +82,19 @@ function updateNametag(nametag, details) {
 	if (updated) updateNametagEntity(nametag);
 }
 
+function deleteNametag(id) {
+	Entities.deleteEntity(nametags[id].entity);
+	delete nametags[id];
+}
+
 function updateUserLocal(id) {
 	var localUser = AvatarList.getAvatar(id);
 	var nametag = nametags[id];
 
 	if (localUser.sessionUUID == null) {
 		if (nametag==undefined) return; // doesnt exist
 		// must have left
-		Entities.deleteEntity(nametag.entity);
-		delete nametag;
+		deleteNametag(id);
 		return;
 	}
 
@@ -173,6 +177,12 @@ function avatarRemovedEvent(id) {
 	gracefullyUpdateUsersAPI();
 }
 
+function hostChanged() {
+	Object.keys(nametags).forEach(function(id) {
+		deleteNametag(id);
+	});
+}
+
 function usernameFromIDReply(id, username, machineFingerprint, isAdmin) {
 	var nametag = nametags[id];
 	if (nametag==undefined) return;
@@ -197,7 +207,7 @@ var updateIntervalAPI = Script.setInterval(function() {
 AvatarList.avatarAddedEvent.connect(avatarAddedEvent);
 AvatarList.avatarRemovedEvent.connect(avatarRemovedEvent);
 // AvatarList.avatarSessionChangedEvent.connect(avatarSessionChangedEvent);
-
+location.hostChanged.connect(hostChanged);
 Users.usernameFromIDReply.connect(usernameFromIDReply);
 
 Script.scriptEnding.connect(function() {
@@ -207,7 +217,7 @@ Script.scriptEnding.connect(function() {
 	AvatarList.avatarAddedEvent.disconnect(avatarAddedEvent);
 	AvatarList.avatarRemovedEvent.disconnect(avatarRemovedEvent);
 	// AvatarList.avatarSessionChangedEvent.disconnect(avatarSessionChangedEvent);
-
+	location.hostChanged.disconnect(hostChanged);
 	Users.usernameFromIDReply.disconnect(usernameFromIDReply);
 
 	Object.keys(nametags).forEach(function(id) {