mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-09-01 18:58:54 +00:00
Merge pull request #1523 from Mycroft-Studios/vehicle-spawn-validation
fix(es_extended/client/functions): validate model is a vehicle
This commit is contained in:
@@ -4,6 +4,6 @@ game 'gta5'
|
||||
author 'ESX-Framework'
|
||||
description 'Allows resources to Run tasks at specific intervals.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
server_script 'server/main.lua'
|
||||
|
||||
@@ -391,7 +391,7 @@ function ESX.UI.Menu.Close(menuType, namespace, name, cancel)
|
||||
else
|
||||
local menu = ESX.UI.Menu.Opened[i]
|
||||
ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
|
||||
|
||||
|
||||
if type(menu.cancel) ~= "nil" then
|
||||
menu.cancel(menu.data, menu)
|
||||
end
|
||||
@@ -412,7 +412,7 @@ function ESX.UI.Menu.CloseAll(cancel)
|
||||
else
|
||||
local menu = ESX.UI.Menu.Opened[i]
|
||||
ESX.UI.Menu.RegisteredTypes[menu.type].close(menu.namespace, menu.name)
|
||||
|
||||
|
||||
if type(menu.cancel) ~= "nil" then
|
||||
menu.cancel(menu.data, menu)
|
||||
end
|
||||
@@ -1585,6 +1585,11 @@ function ESX.GetVehicleTypeClient(model)
|
||||
if not IsModelInCdimage(model) then
|
||||
return false
|
||||
end
|
||||
|
||||
if not IsModelAVehicle(model) then
|
||||
return false
|
||||
end
|
||||
|
||||
if mismatchedTypes[model] then
|
||||
return mismatchedTypes[model]
|
||||
end
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'cerulean'
|
||||
game 'gta5'
|
||||
description 'The Core resource that provides the functionalities for all other resources.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
shared_scripts {
|
||||
'locale.lua',
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
author 'ESX-Framework'
|
||||
description 'A ESX Stylised theme for the chat resource.'
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ game 'gta5'
|
||||
author 'ESX-Framework & Brayden'
|
||||
description 'A simplistic context menu for ESX.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
ui_page 'index.html'
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
shared_scripts {
|
||||
'@es_extended/imports.lua',
|
||||
|
||||
@@ -3,7 +3,7 @@ game 'common'
|
||||
fx_version 'cerulean'
|
||||
author 'ESX-Framework'
|
||||
description 'Allows resources to Run tasks at specific intervals.'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
loadscreen 'index.html'
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
description 'A basic menu system for ESX Legacy.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
description 'A basic input dialog for ESX Legacy.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
client_scripts {
|
||||
'@es_extended/imports.lua',
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
description 'A basic table-based menu system for ESX Legacy.'
|
||||
lua54 'yes'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
|
||||
|
||||
client_scripts {
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'cerulean'
|
||||
game 'gta5'
|
||||
author 'ESX-Framework - Linden - KASH'
|
||||
description 'Allows players to have multiple characters on the same account.'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }
|
||||
|
||||
@@ -2,7 +2,7 @@ fx_version 'adamant'
|
||||
|
||||
lua54 'yes'
|
||||
game 'gta5'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
author 'ESX-Framework'
|
||||
description 'A beautiful and simple NUI notification system for ESX'
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
author 'ESX-Framework'
|
||||
description 'A beautiful and simple NUI progress bar for ESX'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
client_scripts { 'Progress.lua' }
|
||||
|
||||
@@ -2,7 +2,7 @@ fx_version 'adamant'
|
||||
|
||||
game 'gta5'
|
||||
description 'Allows players to customise their character\'s appearance'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
shared_scripts {
|
||||
|
||||
@@ -3,7 +3,7 @@ fx_version 'adamant'
|
||||
game 'gta5'
|
||||
author 'ESX-Framework'
|
||||
description 'A beautiful and simple Persistent Notification system for ESX.'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
client_scripts { 'TextUI.lua' }
|
||||
|
||||
@@ -2,7 +2,7 @@ fx_version 'adamant'
|
||||
|
||||
game 'gta5'
|
||||
description 'Saves/loads character appearances for ESX Legacy.'
|
||||
version '1.11.3'
|
||||
version '1.11.4'
|
||||
lua54 'yes'
|
||||
|
||||
client_scripts {
|
||||
|
||||
Reference in New Issue
Block a user