Merge pull request #1523 from Mycroft-Studios/vehicle-spawn-validation

fix(es_extended/client/functions): validate model is a vehicle
esx-framework · Dec 4, 2024 · dbcffd6 · dbcffd6
2 parents dc2256a + 1b8774f
commit dbcffd6
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 17 deletions.
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
@@ -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'
diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.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

diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
@@ -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',

diff --git a/[core]/esx_chat_theme/fxmanifest.lua b/[core]/esx_chat_theme/fxmanifest.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.'
 

diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
@@ -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'
 

diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
@@ -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',

diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.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'

diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
@@ -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' }
 

diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.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',

diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.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 {

diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
@@ -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' }

diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
@@ -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'
 

diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
@@ -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' }

diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.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 {

diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
@@ -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' }

diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.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 {