From 0a3da5bcad27421e75d5ca4e2c54950b283edd6f Mon Sep 17 00:00:00 2001
From: Robert Crawford <68483930+robert4049@users.noreply.github.com>
Date: Sun, 20 Aug 2023 23:23:39 -0500
Subject: [PATCH 1/3] Update package.json

---
 package.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index bdfceab..685e8a8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,15 @@
 {
+  "resolutions": {
+      "@discordjs/builders": "1.6.3",
+      "@discordjs/formatters": "0.3.1",
+      "@discordjs/util": "0.3.1",
+      "@discordjs/rest": "1.7.1",
+      "@discordjs/ws": "0.8.3",
+      "@discordjs/collection": "1.5.1"
+  },
   "dependencies": {
-    "discord.js": "^14.7.1",
+    "discord.js": "14.10.2",
     "jsonc-parser": "^3.2.0",
     "node-fetch": ">=2.6.7 <3.0.0"
   }
-}
+}
\ No newline at end of file

From 27832dd8ad2913efdc5158f6134f6c2989c30c51 Mon Sep 17 00:00:00 2001
From: Robert Crawford <68483930+robert4049@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:16:02 -0500
Subject: [PATCH 2/3] Update package.json

Updated discord.js version
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 685e8a8..62b7566 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
       "@discordjs/collection": "1.5.1"
   },
   "dependencies": {
-    "discord.js": "14.10.2",
+    "discord.js": "14.11.0",
     "jsonc-parser": "^3.2.0",
     "node-fetch": ">=2.6.7 <3.0.0"
   }
-}
\ No newline at end of file
+}

From 4b06d827b2e5b25672d7a808ca6850e83b4f8aaf Mon Sep 17 00:00:00 2001
From: Robert Crawford <68483930+robert4049@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:38:02 -0500
Subject: [PATCH 3/3] fix: unhandeled nil values 	modified:  
 server/events/ready.js

---
 server/events/ready.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/events/ready.js b/server/events/ready.js
index 1a0f086..61311b8 100644
--- a/server/events/ready.js
+++ b/server/events/ready.js
@@ -49,7 +49,10 @@ module.exports = {
 				if (client.config.General.IsServerUsingQBCore === true) {
 					playerDiscordID = client.QBCore.Functions.GetIdentifier(source, 'discord').substring(8)
 				} else {
-					playerDiscordID = GetPlayerIdentifierByType(source, 'discord').substring(8)
+					playerDiscordID = GetPlayerIdentifierByType(source, 'discord')
+					if(playerDiscordID) {
+						playerDiscordID = playerDiscordID.substring(8)
+					}
 				}
 				let playerName = GetPlayerName(source);
 				if (playerDiscordID) {
@@ -126,7 +129,10 @@ module.exports = {
 		})
 		on('playerDropped', (reason) => {
 			playerCountNum--;
-			let playerActualDiscord = GetPlayerIdentifierByType(source, 'discord').substring(8)
+			let playerActualDiscord = GetPlayerIdentifierByType(source, 'discord')
+			if(playerActualDiscord) {
+				playerActualDiscord = playerActualDiscord.substring(8)
+			}
 			let playerName = GetPlayerName(source);
 			delete client.players[playerName];
 			if (client.config.Debug === true) {