Merge branch '1940-party-zone-indicator' into 'master'

bug #1940: Fixed an issue causing players to always display as in a different...

Closes #1940

See merge request Isleward/isleward!602

src/client/ui/templates/party/party.js

@@ -54,28 +54,30 @@ define([
 			msg.forEach(m => {
 				const { id: mId, zoneId: mZone } = m;
 
-				if (party.indexOf(m.id) === -1)
+				if (!party.includes(m.id))
 					return;
 
-				if (mId === playerId) {
-					party.forEach(p => {
-						const mObj = globals.onlineList.find(o => o.id === p);
-
-						let el = this.find('.member[memberId="' + p + '"]');
-						el.removeClass('differentZone');
-
-						if (mObj.mZone !== mZone)
-							el.addClass('differentZone');
-					});
-				} else {
-					let el = this.find('.member[memberId="' + m.id + '"]');
+				if (mId !== playerId) {
+					const el = this.find('.member[memberId="' + m.id + '"]');
 					el.removeClass('differentZone');
 
-					if (m.mZone !== playerZone)
+					if (m.zoneId !== playerZone)
 						el.addClass('differentZone');
 
 					el.find('.txtLevel').html('level: ' + m.level);
+
+					return;
 				}
+
+				party.forEach(p => {
+					const mObj = globals.onlineList.find(o => o.id === p);
+
+					const el = this.find('.member[memberId="' + p + '"]');
+					el.removeClass('differentZone');
+
+					if (mObj.zoneId !== mZone)
+						el.addClass('differentZone');
+				});
 			});
 		},
 

src/server/security/connections.js

@@ -152,6 +152,7 @@ module.exports = {
 
 			result.push({
 				zoneName: p.zoneName,
+				zoneId: p.zoneId,
 				name: p.name,
 				level: p.level,
 				class: p.class,

src/server/world/atlas.js

@@ -49,6 +49,8 @@ module.exports = {
 		serverObj.zoneId = thread.id;
 		serverObj.zoneName = thread.name;
 
+		serverObj.player.broadcastSelf();
+
 		const simpleObj = obj.getSimple ? obj.getSimple(true, true) : obj;
 
 		this.send(obj.zoneId, {
@@ -290,8 +292,6 @@ module.exports = {
 			delete serverObj.zoneId;
 			delete obj.zoneId;
 
-			serverObj.player.broadcastSelf();
-
 			const isRezone = true;
 			await this.addObject(obj, keepPos, isRezone);
 		},