From 78cefcb2250f46b3f94debfc25fbe2624348a5a7 Mon Sep 17 00:00:00 2001
From: Shaun <skichenbrand@gmail.com>
Date: Sun, 1 May 2022 12:25:53 +0200
Subject: [PATCH] bug: Fixed crash when receiving messages before window.player
 exists

---
 src/client/ui/templates/messages/messages.js | 3 +++
 src/client/ui/templates/party/party.js       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js
index bf43ecf8..69746528 100644
--- a/src/client/ui/templates/messages/messages.js
+++ b/src/client/ui/templates/messages/messages.js
@@ -191,6 +191,9 @@ define([
 		},
 
 		onGetMessages: function (e) {
+			if (!window.player)
+				return;
+			
 			let messages = e.messages;
 			if (!messages.length)
 				messages = [messages];
diff --git a/src/client/ui/templates/party/party.js b/src/client/ui/templates/party/party.js
index 15a06f17..94bd21ab 100644
--- a/src/client/ui/templates/party/party.js
+++ b/src/client/ui/templates/party/party.js
@@ -39,6 +39,9 @@ define([
 		},
 
 		onGetConnectedPlayer: function (msg) {
+			if (!window.player)
+				return;
+
 			const { party } = this;
 			const { player: { serverId: playerId, zoneId: playerZone } } = window;