diff --git a/scripts/server/account.js b/scripts/server/account.js index 9d52dafd..97a117f2 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -607,7 +607,7 @@ function loginSuccess(client) { if(getPlayerData(client).subAccounts.length == 0) { if(doesServerHaveGUIEnabled() && doesPlayerHaveGUIEnabled(client)) { - showPlayerPromptGUI(client, getLocaleString(client, "NoCharactersGUIMessage"), getLocaleString(client, "NoCharactersGUIWindowTitle"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); + showPlayerPrompt(client, getLocaleString(client, "NoCharactersGUIMessage"), getLocaleString(client, "NoCharactersGUIWindowTitle"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); getPlayerData(client).promptType = VRR_PROMPT_CREATEFIRSTCHAR; logToConsole(LOG_DEBUG, `[VRR.Account] ${getPlayerDisplayForConsole(client)} is being shown the no characters prompt GUI`); } else { @@ -990,7 +990,7 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress if(doesServerHaveGUIEnabled() && doesPlayerHaveGUIEnabled(client)) { showPlayerRegistrationSuccessGUI(client); - showPlayerPromptGUI(client, getLocaleString(client, "NoCharactersMessage"), getLocaleString(client, "NoCharactersWindowTitle"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); + showPlayerPrompt(client, getLocaleString(client, "NoCharactersMessage"), getLocaleString(client, "NoCharactersWindowTitle"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); getPlayerData(client).promptType = VRR_PROMPT_CREATEFIRSTCHAR; } else { messagePlayerAlert(client, getLocaleString(client, "NoCharactersChatMessage"), `{ALTCOLOUR}/newchar{MAINCOLOUR}`); diff --git a/scripts/server/client.js b/scripts/server/client.js index 1c6e6f79..774fe143 100644 --- a/scripts/server/client.js +++ b/scripts/server/client.js @@ -381,7 +381,7 @@ function showPlayerCharacterSelectFailedGUI(client) { // =========================================================================== -function showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText, noButtonText) { +function showPlayerPrompt(client, promptMessage, promptTitle, yesButtonText, noButtonText) { logToConsole(LOG_DEBUG, `[VRR.Client] Sending show prompt GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${promptTitle}, Message: ${promptMessage})`); sendNetworkEventToPlayer("vrr.showPrompt", client, promptMessage, promptTitle, yesButtonText, noButtonText); } diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js index 9cbe7653..b92fcb5c 100644 --- a/scripts/server/vehicle.js +++ b/scripts/server/vehicle.js @@ -265,42 +265,6 @@ function getNearbyVehiclesCommand(command, params, client) { // =========================================================================== -function vehicleLockCommand(command, params, client) { - let vehicle = getClosestVehicle(getPlayerPosition(client)); - - if(!getPlayerVehicle(client) && getDistance(getVehiclePosition(vehicle), getPlayerPosition(client)) > getGlobalConfig().vehicleLockDistance) { - messagePlayerError(client, getLocaleString(client, "MustBeInOrNearVehicle")); - return false; - } - - if(!getVehicleData(vehicle)) { - messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); - return false; - } - - if(isPlayerInAnyVehicle(client)) { - vehicle = getPlayerVehicle(client); - if(!isPlayerInFrontVehicleSeat(client)) { - messagePlayerError(client, getLocaleString(client, "MustBeInVehicleFrontSeat")); - return false; - } - } else { - if(!doesPlayerHaveVehicleKeys(client, vehicle)) { - messagePlayerError(client, getLocaleString(client, "DontHaveVehicleKey")); - return false; - } - } - - getVehicleData(vehicle).locked = !getVehicleData(vehicle).locked; - vehicle.locked = getVehicleData(vehicle).locked; - - getVehicleData(vehicle).needsSaved = true; - - meActionToNearbyPlayers(client, `${toLowerCase(getLockedUnlockedFromBool(getVehicleData(vehicle).locked))} the ${getVehicleName(vehicle)}`); -} - -// =========================================================================== - function vehicleTrunkCommand(command, params, client) { let vehicle = getClosestVehicle(getPlayerPosition(client)); @@ -814,7 +778,7 @@ function setVehicleClanCommand(command, params, client) { return false; } - showPlayerPromptGUI(client, getLocaleString(client, "SetVehicleClanConfirmMessage"), getLocaleString(client, "SetVehicleClanConfirm"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); + showPlayerPrompt(client, getLocaleString(client, "SetVehicleClanConfirmMessage"), getLocaleString(client, "SetVehicleClanConfirm"), getLocaleString(client, "Yes"), getLocaleString(client, "No")); getPlayerData(client).promptType = VRR_PROMPT_GIVEVEHTOCLAN; getVehicleData(vehicle).needsSaved = true;