diff --git a/.gitignore b/.gitignore index 18f7a56..5c65614 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ ND_Blackjack/ -ND_Blips/ \ No newline at end of file +ND_Blips/ +ND_Inventory/ +ND_Laser/ \ No newline at end of file diff --git a/ND_Core/server/events.lua b/ND_Core/server/events.lua index 202db9e..c899bd9 100644 --- a/ND_Core/server/events.lua +++ b/ND_Core/server/events.lua @@ -41,7 +41,7 @@ end) -- Getting all the characters the player has and returning them to the client. RegisterNetEvent("ND:GetCharacters", function() local player = source - print(NDCore.Functions.GetPlayerCharacters(player)[1]) + Wait(100) TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player)) end) diff --git a/ND_Core/server/functions.lua b/ND_Core/server/functions.lua index 7be058c..be97760 100644 --- a/ND_Core/server/functions.lua +++ b/ND_Core/server/functions.lua @@ -10,7 +10,7 @@ end function NDCore.Functions.GetUserDiscordInfo(discordUserId) local data PerformHttpRequest("https://discordapp.com/api/guilds/" .. server_config.guildId .. "/members/" .. discordUserId, function(errorCode, resultData, resultHeaders) - if errorCode ~= 200 then + if errorCode ~= 200 then print("Error: " .. errorCode .. ", discord token might be missing.") return end diff --git a/ND_Fuel/source/client.lua b/ND_Fuel/source/client.lua index cd47eb4..85641f8 100644 --- a/ND_Fuel/source/client.lua +++ b/ND_Fuel/source/client.lua @@ -221,6 +221,7 @@ CreateThread(function() pedCoords = GetEntityCoords(ped) pump, pumpHandle = nearPump(pedCoords) veh = GetVehiclePedIsIn(ped, true) + inveh = GetVehiclePedIsIn(ped, false) Wait(500) end end) @@ -319,7 +320,7 @@ CreateThread(function() local wait = 500 while true do Wait(wait) - if pump then + if pump and inveh == 0 then wait = 0 if not holdingNozzle and not nozzleInVehicle and not nozzleDropped then local jerryCanText = "" diff --git a/README.md b/README.md index f32df93..01ffa41 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
Documentation # Description: -This is a dojrp inspired framework, with a money system and extra features. +This is a framework, with a money system and extra features. # Addons: You can find most free addons in the ND_Framework repository and you can find more paid ones on [tebex](https://andyyy.tebex.io/category/fivem-scripts?currency=USD).