From d8eeeefc8df289537ac43da22c17bf7c9a24b20e Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 20 May 2022 17:34:15 -0500
Subject: [PATCH] Remove echo for resources and setup game on spawn

---
 scripts/server/event.js | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/scripts/server/event.js b/scripts/server/event.js
index 22548554..b463f892 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -94,16 +94,13 @@ function onPlayerQuit(client, quitReasonId) {
 		resetClientStuff(client);
 		getServerData().clients[getPlayerId(client)] = null;
 	}
-
-	clearTemporaryVehicles();
-	clearTemporaryPeds();
 }
 
 // ===========================================================================
 
-async function onPlayerChat(client, messageText) {
+function onPlayerChat(client, messageText) {
 	processPlayerChat(client, messageText);
-	event.preventDefault();
+	return false;
 }
 
 // ===========================================================================
@@ -177,9 +174,9 @@ function onPedExitingVehicle(ped, vehicle) {
 function onResourceStart(resource) {
 	logToConsole(LOG_WARN, `[VRR.Event] Resource ${resource.name} started!`);
 
-	if(resource != thisResource) {
-		messageAdmins(`{MAINCOLOUR}Resource {ALTCOLOUR}${resource.name}{MAINCOLOUR} started!`);
-	}
+	//if(resource != thisResource) {
+	//	messageAdmins(`{MAINCOLOUR}Resource {ALTCOLOUR}${resource.name}{MAINCOLOUR} started!`);
+	//}
 }
 
 // ===========================================================================
@@ -187,9 +184,9 @@ function onResourceStart(resource) {
 function onResourceStop(resource) {
 	logToConsole(LOG_WARN, `[VRR.Event] Resource ${resource.name} stopped!`);
 
-	if(resource != thisResource) {
-		messageAdmins(`{MAINCOLOUR}Resource {ALTCOLOUR}${resource.name}{MAINCOLOUR} stopped!`);
-	}
+	//if(resource != thisResource) {
+	//	messageAdmins(`{MAINCOLOUR}Resource {ALTCOLOUR}${resource.name}{MAINCOLOUR} stopped!`);
+	//}
 
 	if(resource == thisResource) {
 		kickAllClients();
@@ -497,9 +494,6 @@ function onPlayerSpawn(client) {
 	//messagePlayerNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange"));
 	//messagePlayerNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow"));
 
-	logToConsole(LOG_DEBUG, `[VRR.Event] Updating spawned state for ${getPlayerDisplayForConsole(client)} to true`);
-	updatePlayerSpawnedState(client, true);
-
 	logToConsole(LOG_DEBUG, `[VRR.Event] Setting player interior for ${getPlayerDisplayForConsole(client)} to ${getPlayerCurrentSubAccount(client).interior}`);
 	setPlayerInterior(client, getPlayerCurrentSubAccount(client).interior);
 
@@ -603,6 +597,9 @@ function onPlayerSpawn(client) {
 		requestPlayerPedNetworkId(client);
 	}
 
+	logToConsole(LOG_DEBUG, `[VRR.Event] Updating spawned state for ${getPlayerDisplayForConsole(client)} to true`);
+	updatePlayerSpawnedState(client, true);
+
 	getPlayerData(client).payDayTickStart = sdl.ticks;
 
 	messageDiscordEventChannel(`🧍 ${getPlayerName(client)} spawned as ${getCharacterFullName(client)}`);