From 877aaa4aef4079df6139dafddf31ccce73b3b488 Mon Sep 17 00:00:00 2001
From: Shaun <skichenbrand@gmail.com>
Date: Mon, 16 Oct 2023 17:50:57 +0200
Subject: [PATCH] bug: another attempt at fixing the crash when party members
 rezone

---
 src/server/world/atlas.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/server/world/atlas.js b/src/server/world/atlas.js
index 62cdb201..2d604e71 100644
--- a/src/server/world/atlas.js
+++ b/src/server/world/atlas.js
@@ -24,7 +24,17 @@ module.exports = {
 
 		const partyIds = obj.components.find(c => c.type === 'social')?.party;
 		if (partyIds) {
-			const partyLeader = cons.players.find(p => partyIds.includes(p.id) && p.components.find(c => c.type === 'social')?.isPartyLeader);
+			const partyLeader = cons.players.find(p => {
+				if (!partyIds.includes(p.id))
+					return false;
+
+				const cpnSocial = p.components.find(c => c.type === 'social');
+
+				if (!cpnSocial)
+					return false;
+
+				return cpnSocial.isPartyLeader;
+			});
 
 			if (partyLeader?.zoneName === zoneName)
 				zoneId = partyLeader.zoneId;