From 425f40589794c1fed52772dc9baa9225ba642672 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 30 Jul 2022 08:18:18 -0500
Subject: [PATCH] Remove some event-based net events

---
 scripts/server/netevents.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/server/netevents.js b/scripts/server/netevents.js
index 29b4eef8..dc30cb1b 100644
--- a/scripts/server/netevents.js
+++ b/scripts/server/netevents.js
@@ -32,11 +32,7 @@ function addAllNetworkEventHandlers() {
 
 	// Event
 	addNetworkEventHandler("agrp.pickup", onPlayerNearPickup);
-	addNetworkEventHandler("agrp.enteredSphere", onPlayerEnteredSphere);
-	addNetworkEventHandler("agrp.exitedSphere", onPlayerExitedSphere);
 	addNetworkEventHandler("agrp.playerDeath", onPlayerDeath);
-	//addNetworkEventHandler("agrp.onPlayerEnterVehicle", onPlayerEnteredVehicle);
-	//addNetworkEventHandler("agrp.onPlayerExitVehicle", onPlayerExitedVehicle);
 
 	// Job
 	addNetworkEventHandler("agrp.arrivedAtJobRouteLocation", playerArrivedAtJobRouteLocation);
@@ -109,7 +105,7 @@ function updatePlayerPing(client) {
 function playerClientReady(client) {
 	playerResourceReady[client.index] = true;
 	logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s client resources are downloaded and ready! Started: ${getYesNoFromBool(playerResourceStarted[client.index])}`);
-	if (playerResourceStarted[client.index] == true) {
+	if (playerResourceStarted[client.index] == true && playerInitialized[client.index] == false) {
 		initClient(client);
 	}
 }
@@ -126,7 +122,7 @@ function playerGUIReady(client) {
 function playerClientStarted(client) {
 	playerResourceStarted[client.index] = true;
 	logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s client resources are started and running! Ready: ${getYesNoFromBool(playerResourceReady[client.index])}`);
-	if (playerResourceReady[client.index] == true) {
+	if (playerResourceReady[client.index] == true && playerInitialized[client.index] == false) {
 		initClient(client);
 	}
 }