FumeNodes/ND_Core
1
0
Fork 0
mirror of https://github.com/ND-Framework/ND_Core.git synced 2026-08-17 05:56:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from nik0-3d/main

Browse Source 
fix(ND_Fuel) fixed being able to grab a pump from inside a vehicle
This commit is contained in:
Niko
2022-07-29 01:39:10 -04:00
committed by GitHub
parent a26703e42a 95d0ff204c
commit cc5ffe159c
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,3 +1,5 @@
ND_Blackjack/ ND_Blackjack/
ND_Blips/ ND_Blips/
ND_Inventory/
ND_Laser/

2
ND_Core/server/events.lua
View File

@@ -41,7 +41,7 @@ end)
-- Getting all the characters the player has and returning them to the client. -- Getting all the characters the player has and returning them to the client.
RegisterNetEvent("ND:GetCharacters", function() RegisterNetEvent("ND:GetCharacters", function()
local player = source local player = source
print(NDCore.Functions.GetPlayerCharacters(player)[1]) Wait(100)
TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player)) TriggerClientEvent("ND:returnCharacters", player, NDCore.Functions.GetPlayerCharacters(player))
end) end)

2
ND_Core/server/functions.lua
View File

@@ -10,7 +10,7 @@ end
function NDCore.Functions.GetUserDiscordInfo(discordUserId) function NDCore.Functions.GetUserDiscordInfo(discordUserId)
local data local data
PerformHttpRequest("https://discordapp.com/api/guilds/" .. server_config.guildId .. "/members/" .. discordUserId, function(errorCode, resultData, resultHeaders) 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.") print("Error: " .. errorCode .. ", discord token might be missing.")
return return
end end

3
ND_Fuel/source/client.lua
View File

@@ -221,6 +221,7 @@ CreateThread(function()
pedCoords = GetEntityCoords(ped) pedCoords = GetEntityCoords(ped)
pump, pumpHandle = nearPump(pedCoords) pump, pumpHandle = nearPump(pedCoords)
veh = GetVehiclePedIsIn(ped, true) veh = GetVehiclePedIsIn(ped, true)
inveh = GetVehiclePedIsIn(ped, false)
Wait(500) Wait(500)
end end
end) end)
@@ -319,7 +320,7 @@ CreateThread(function()
local wait = 500 local wait = 500
while true do while true do
Wait(wait) Wait(wait)
if pump then if pump and inveh == 0 then
wait = 0 wait = 0
if not holdingNozzle and not nozzleInVehicle and not nozzleDropped then if not holdingNozzle and not nozzleInVehicle and not nozzleDropped then
local jerryCanText = "" local jerryCanText = ""

2
README.md
View File

@@ -4,7 +4,7 @@
<p align='center'><b><a href="https://ndframework.gitbook.io/nd-framework/">Documentation</a></b> <p align='center'><b><a href="https://ndframework.gitbook.io/nd-framework/">Documentation</a></b>
# Description: # 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: # 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). 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).