From 86438bbd5aa8e29ff278f2d3ac5dcdaf8f8baf93 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 26 May 2022 17:30:49 -0500
Subject: [PATCH] Move all GUI net events to net event file

---
 scripts/client/server.js | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/scripts/client/server.js b/scripts/client/server.js
index f252057b..844d7fb3 100644
--- a/scripts/client/server.js
+++ b/scripts/client/server.js
@@ -89,7 +89,20 @@ function addAllNetworkHandlers() {
 	addNetworkEventHandler("vrr.showResetPasswordCodeInput", resetPasswordCodeInputGUI);
 	addNetworkEventHandler("vrr.showResetPasswordEmailInput", resetPasswordEmailInputGUI);
 	addNetworkEventHandler("vrr.showChangePassword", showChangePasswordGUI);
-
+	addNetworkEventHandler("vrr.showCharacterSelect", showCharacterSelectGUI);
+	addNetworkEventHandler("vrr.switchCharacterSelect", switchCharacterSelectGUI);
+	addNetworkEventHandler("vrr.showError", showErrorGUI);
+	addNetworkEventHandler("vrr.showInfo", showInfoGUI);
+	addNetworkEventHandler("vrr.showPrompt", showYesNoPromptGUI);
+	addNetworkEventHandler("vrr.loginSuccess", loginSuccess);
+	addNetworkEventHandler("vrr.characterSelectSuccess", characterSelectSuccess);
+	addNetworkEventHandler("vrr.loginFailed", loginFailed);
+	addNetworkEventHandler("vrr.registrationSuccess", registrationSuccess);
+	addNetworkEventHandler("vrr.registrationFailed", registrationFailed);
+	addNetworkEventHandler("vrr.newCharacterFailed", newCharacterFailed);
+	addNetworkEventHandler("vrr.changePassword", showChangePasswordGUI);
+	addNetworkEventHandler("vrr.showLocaleChooser", showLocaleChooserGUI);
+	addNetworkEventHandler("vrr.guiColour", setGUIColours);
 
 	// Business
 	addNetworkEventHandler("vrr.business", receiveBusinessFromServer);
@@ -125,9 +138,9 @@ function addAllNetworkHandlers() {
 	addNetworkEventHandler("vrr.nametag", updatePlayerNameTag);
 	addNetworkEventHandler("vrr.nametagDistance", setNameTagDistance);
 	addNetworkEventHandler("vrr.ping", updatePlayerPing);
-	addNetworkEventHandler("vrr.pedAnim", makePedPlayAnimation);
-	addNetworkEventHandler("vrr.pedStopAnim", makePedStopAnimation);
-	addNetworkEventHandler("vrr.forcePedAnim", forcePedAnimation);
+	addNetworkEventHandler("vrr.anim", makePedPlayAnimation);
+	addNetworkEventHandler("vrr.stopAnim", makePedStopAnimation);
+	addNetworkEventHandler("vrr.forceAnim", forcePedAnimation);
 	addNetworkEventHandler("vrr.clientInfo", serverRequestedClientInfo);
 	addNetworkEventHandler("vrr.interiorLights", updateInteriorLightsState);
 	addNetworkEventHandler("vrr.cutsceneInterior", setCutsceneInterior);
@@ -193,6 +206,18 @@ function onServerSpawnedLocalPlayer(state) {
 		setTimeout(function() {
 			calledDeathEvent = false;
 		}, 1000);
+
+		getPeds().filter(ped => !ped.isType(ELEMENT_PLAYER)).forEach(ped => {
+			syncCivilianProperties(ped);
+		});
+
+		getPlayers().forEach(player => {
+			syncPlayerProperties(player);
+		});
+
+		getVehicles().forEach(veh => {
+			syncVehicleProperties(veh);
+		});
 	}
 }