From 215124a0bca1174e029dbdf4a89e414806ee0220 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 30 Jul 2022 08:16:35 -0500
Subject: [PATCH] Allow null client in bug/idea report func

---
 scripts/server/developer.js | 39 ++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/scripts/server/developer.js b/scripts/server/developer.js
index dc000581..ff7ef1f6 100644
--- a/scripts/server/developer.js
+++ b/scripts/server/developer.js
@@ -152,9 +152,7 @@ function addLogLevelCommand(command, params, client) {
 	}
 
 	sendPlayerLogLevel(null, logLevel);
-
 	messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}enabled log level {ALTCOLOUR}${toLowerCase(params)}`);
-
 	return true;
 }
 
@@ -183,8 +181,7 @@ function getLogLevelCommand(command, params, client) {
 		logLevels.push("verbose");
 	}
 
-	messagePlayerAlert(`{MAINCOLOUR}Current log levels: {ALTCOLOUR}${toLowerCase(logLevels.join(", "))}`);
-
+	messagePlayerAlert(client, `{MAINCOLOUR}Current log levels: {ALTCOLOUR}${toLowerCase(logLevels.join(", "))}`);
 	return true;
 }
 
@@ -222,9 +219,7 @@ function removeLogLevelCommand(command, params, client) {
 	}
 
 	sendPlayerLogLevel(null, logLevel);
-
 	messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}disabled log level {ALTCOLOUR}${toLowerCase(params)}`);
-
 	return true;
 }
 
@@ -501,15 +496,21 @@ function clientRunCodeSuccess(client, returnTo, returnVal) {
 // ===========================================================================
 
 function submitIdea(client, ideaText) {
-	let position = (getPlayerVehicle(client)) ? getVehiclePosition(getPlayerVehicle(client)) : getPlayerPosition(client);
-	let heading = (getPlayerVehicle(client)) ? getVehicleHeading(getPlayerVehicle(client)) : getPlayerHeading(client);
+	let position = toVector3(0.0, 0.0, 0.0);
+	let heading = 0.0;
 	let session = 0;
 	let databaseId = 0;
 
-	if (isConsole(client)) {
-		databaseId = -1;
+	if (client != null) {
+		if (isConsole(client)) {
+			databaseId = -1;
+		} else {
+			databaseId = getPlayerData(client).accountData.databaseId;
+			position = (getPlayerVehicle(client)) ? getVehiclePosition(getPlayerVehicle(client)) : getPlayerPosition(client);
+			heading = (getPlayerVehicle(client)) ? getVehicleHeading(getPlayerVehicle(client)) : getPlayerHeading(client);
+		}
 	} else {
-		databaseId = getPlayerData(client).accountData.databaseId;
+		databaseId = defaultNoAccountId;
 	}
 
 	let dbConnection = connectToDatabase();
@@ -522,15 +523,21 @@ function submitIdea(client, ideaText) {
 // ===========================================================================
 
 function submitBugReport(client, bugText) {
-	let position = (getPlayerVehicle(client)) ? getVehiclePosition(getPlayerVehicle(client)) : getPlayerPosition(client);
-	let heading = (getPlayerVehicle(client)) ? getVehicleHeading(getPlayerVehicle(client)) : getPlayerHeading(client);
+	let position = toVector3(0.0, 0.0, 0.0);
+	let heading = 0.0;
 	let session = 0;
 	let databaseId = 0;
 
-	if (isConsole(client)) {
-		databaseId = -1;
+	if (client != null) {
+		if (isConsole(client)) {
+			databaseId = -1;
+		} else {
+			databaseId = getPlayerData(client).accountData.databaseId;
+			position = (getPlayerVehicle(client)) ? getVehiclePosition(getPlayerVehicle(client)) : getPlayerPosition(client);
+			heading = (getPlayerVehicle(client)) ? getVehicleHeading(getPlayerVehicle(client)) : getPlayerHeading(client);
+		}
 	} else {
-		databaseId = getPlayerData(client).accountData.databaseId;
+		databaseId = defaultNoAccountId;
 	}
 
 	let dbConnection = connectToDatabase();