From 0dcc760a191b1ec8ab9956dd2ff72a57e03ad058 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 26 Dec 2020 02:00:43 -0600
Subject: [PATCH] Fix for client scripts not being loaded

---
 scripts/client/main.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/client/main.js b/scripts/client/main.js
index 2df3770b..86c7efd5 100644
--- a/scripts/client/main.js
+++ b/scripts/client/main.js
@@ -62,7 +62,7 @@ addEventHandler("onPickupCollected", function(event, pickup, ped) {
 // ---------------------------------------------------------------------------
 
 bindEventHandler("onResourceStart", thisResource, function(event, resource) {
-    triggerNetworkEvent("ag.clientReady");
+    triggerNetworkEvent("ag.clientStarted");
 
     addEvent("OnLocalPlayerEnterSphere", 1);
     addEvent("OnLocalPlayerExitSphere", 1);
@@ -77,6 +77,13 @@ bindEventHandler("onResourceStart", thisResource, function(event, resource) {
     addNetworkHandler("ag.passenger", enterVehicleAsPassenger);
 });
 
+// ---------------------------------------------------------------------------
+
+bindEventHandler("onResourceReady", thisResource, function(event, resource) {
+    triggerNetworkEvent("ag.clientReady");
+});
+
+
 // ----------------------------------------------------------------------------
 
 bindEventHandler("OnResourceStop", thisResource, function(event, resource) {
@@ -150,8 +157,7 @@ function syncVehicle(vehicle) {
         }  
     }
 }
-addNetworkHandler("ag.veh.sync", syncVehicle)
-;
+addNetworkHandler("ag.veh.sync", syncVehicle);
 
 // ---------------------------------------------------------------------------
 
@@ -492,15 +498,6 @@ addEventHandler("OnPedWasted", function(event, wastedPed, killerPed, weapon, ped
 addNetworkHandler("ag.showBusStop", function(position, colour) {
     busStopSphere = gta.createSphere(position, 3);
     busStopBlip = gta.createBlip(position, 0, 2, colour);
-
-    bindEventHandler("OnLocalPlayerEnterSphere", busStopSphere, function(event, sphere) {
-        triggerNetworkEvent("ag.arrivedAtBusStop");
-        unbindEventHandler("OnLocalPlayerEnterSphere", busStopSphere);
-        destroyElement(busStopSphere);
-        destroyElement(busStopBlip);
-        busStopSphere = null;
-        busStopBlip = null;
-    });
 });
 
 // ---------------------------------------------------------------------------
@@ -519,4 +516,16 @@ addNetworkHandler("ag.removeWorldObject", function(model, position, range) {
     gta.removeWorldObject(model, position, range);
 });
 
+// ---------------------------------------------------------------------------
+
+addEventHandler("OnLocalPlayerEnterSphere", function(event, sphere) {
+    if(sphere == busStopSphere) {
+        destroyElement(busStopSphere);
+        destroyElement(busStopBlip);
+        busStopSphere = null;
+        busStopBlip = null;
+        triggerNetworkEvent("ag.arrivedAtBusStop");
+    }
+});
+
 // ---------------------------------------------------------------------------
\ No newline at end of file