From 404aad0147e85b08fc03b94eedf91a69625012e6 Mon Sep 17 00:00:00 2001 From: Shaun Date: Fri, 27 May 2022 21:16:35 +0200 Subject: [PATCH] bug #1940: Fixed an issue causing players to always display as in a different zone in the party list --- src/client/ui/templates/party/party.js | 4 ++-- src/server/security/connections.js | 1 + src/server/world/atlas.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/ui/templates/party/party.js b/src/client/ui/templates/party/party.js index 94bd21ab..7b23ca66 100644 --- a/src/client/ui/templates/party/party.js +++ b/src/client/ui/templates/party/party.js @@ -64,14 +64,14 @@ define([ let el = this.find('.member[memberId="' + p + '"]'); el.removeClass('differentZone'); - if (mObj.mZone !== mZone) + if (mObj.zoneId !== mZone) el.addClass('differentZone'); }); } else { let 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); diff --git a/src/server/security/connections.js b/src/server/security/connections.js index 091b96b8..94771b05 100644 --- a/src/server/security/connections.js +++ b/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, diff --git a/src/server/world/atlas.js b/src/server/world/atlas.js index 1ad943cd..0062e06d 100644 --- a/src/server/world/atlas.js +++ b/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); },