From 1299981dda6886e7713fb035ea63e31add776e55 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:25:55 -0500
Subject: [PATCH] Shorten vehicle engine message to one line

---
 scripts/server/event.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/server/event.js b/scripts/server/event.js
index d0ca2368..97ac701a 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -224,20 +224,24 @@ async function onPlayerEnteredVehicle(client, clientVehicle, seat) {
             if(getVehicleData(vehicle).buyPrice > 0) {
                 messagePlayerAlert(client, `This ${getVehicleName(vehicle)} is for sale! Cost: [#AAAAAA]$${getVehicleData(vehicle).buyPrice}`);
                 messagePlayerTip(client, `Use /vehbuy if you want to buy it.`);
+                resetVehiclePosition(vehicle);
             } else if(getVehicleData(vehicle).rentPrice > 0) {
                 messagePlayerAlert(client, `This ${getVehicleName(vehicle)} is for rent! Cost: [#AAAAAA]$${getVehicleData(vehicle).rentPrice} per minute`);
                 messagePlayerTip(client, `Use /vehrent if you want to rent it.`);
+                resetVehiclePosition(vehicle);
             } else {
                 if(!getVehicleData(vehicle).engine) {
                     if(doesPlayerHaveVehicleKeys(client, vehicle)) {
-                        messagePlayerAlert(client, `This ${getVehicleName(vehicle)}'s engine is off. Use /engine to start it`);
                         if(doesPlayerHaveKeyBindForCommand(client, "engine")) {
-                            messagePlayerTip(client, `You can also press [#AAAAAA]${sdl.getKeyName(getPlayerKeyBindForCommand(client, "engine").key)} [#FFFFFF]to start and stop the engine.`);
+                            messagePlayerTip(client, `This ${getVehicleName(vehicle)}'s engine is off. Press [#AAAAAA]${sdl.getKeyName(getPlayerKeyBindForCommand(client, "engine").key)} [#FFFFFF]to start it.`);
+                        } else {
+                            messagePlayerAlert(client, `This ${getVehicleName(vehicle)}'s engine is off. Use /engine to start it`);
                         }
                     } else {
                         messagePlayerAlert(client, `This ${getVehicleName(vehicle)}'s engine is off and you don't have the keys to start it`);
+
                     }
-                    //setPlayerControlState(client, false);
+                    resetVehiclePosition(vehicle);
                 }
             }