From 4a0b9e7bad0ba7ec93eb5e4b594397c28ed3a894 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:52:23 -0600
Subject: [PATCH] Check if veh data exists on entered

---
 scripts/server/event.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/server/event.js b/scripts/server/event.js
index f4ce345a..58849172 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -143,6 +143,10 @@ async function playerEnteredVehicle(client) {
     await waitUntil(() => client.player.vehicle != null);
     let vehicle = client.player.vehicle;
 
+    if(!getVehicleData(vehicle)) {
+        return false;
+    }
+
     console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} entered a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("ag.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
 
     getPlayerData(client).lastVehicle = vehicle;
@@ -198,6 +202,10 @@ async function playerEnteredVehicle(client) {
 function playerExitedVehicle(client) {
     let vehicle = getPlayerData(client).lastVehicle;
 
+    if(!getVehicleData(vehicle)) {
+        return false;
+    }
+
     console.log(`[Asshat.Event] ${getClientDisplayForConsole(client)} exited a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("ag.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
 
     if(isPlayerWorking(client)) {