Merge branch 'master' of https://github.com/MrDaGree/ELS-FiveM

MrDaGree · Jun 23, 2020 · 1720ced · 1720ced
2 parents 1dc6f2e + 0f4c133
commit 1720ced
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/__resource.lua b/__resource.lua
diff --git a/client/client.lua b/client/client.lua
@@ -801,7 +801,7 @@ Citizen.CreateThread(function()
     while true do
         for k,v in pairs(elsVehs) do
             if(v ~= nil or DoesEntityExist(k)) then
-                if (GetDistanceBetweenCoords(GetEntityCoords(k, true), GetEntityCoords(GetPlayerPed(-1), true), true) <= vehicleSyncDistance) then
+                if #(GetEntityCoords(k)-GetEntityCoords(GetPlayerPed(-1))) <= vehicleSyncDistance then
                     if elsVehs[k].warning or elsVehs[k].secondary or elsVehs[k].primary then
                         SetVehicleEngineOn(k, true, true, false)
                     end
@@ -848,10 +848,9 @@ end)
 
 
 Citizen.CreateThread(function()
-
     while true do
         for k,v in pairs(elsVehs) do
-            if (v ~= nil and DoesEntityExist(k) and GetDistanceBetweenCoords(GetEntityCoords(k, true), GetEntityCoords(GetPlayerPed(-1), true), true) <= vehicleSyncDistance) then
+            if v ~= nil and DoesEntityExist(k) and #(GetEntityCoords(k)-GetEntityCoords(GetPlayerPed(-1))) <= vehicleSyncDistance then
                 SetVehicleAutoRepairDisabled(k, true)
 
                 if getVehicleVCFInfo(k) == false then

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -0,0 +1,23 @@
+fx_version 'bodacious'
+games { 'gta5' }
+
+author 'MrDaGree'
+description 'ELS FiveM'
+version '1.7.0'
+
+client_script {
+    'vcf.lua',
+    'config.lua',
+    'client/**/*.lua'
+}
+
+server_script {
+    'vcf.lua',
+    'config.lua',
+    'server/server.lua',
+    'server/xml.lua'
+}
+
+shared_script 'shared/*.lua'
+
+