Skip to content

fix: updates for new esx #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FlawetDev wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: updates for new esx #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3b665f
fix: updates for new esx
FlawetDev Feb 26, 2024
de85a79
update for compatibility with new esx
FlawetDev Feb 26, 2024
8389ed6
Update config.lua
FlawetDev Feb 26, 2024
d812609
Update server.lua
FlawetDev Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
ESX = nil

TriggerEvent(Config.ESXTrigger, function(obj) ESX = obj end)


RegisterNetEvent('esx:playerLoaded')
AddEventHandler('esx:playerLoaded', function(xPlayer)
ESX.PlayerData = xPlayer
end)
RegisterNetEvent('esx:setJob')
AddEventHandler('esx:setJob', function(job)
ESX.PlayerData.job = job
end)
RegisterNetEvent('esx:setJob2')
AddEventHandler('esx:setJob2', function(job2)
ESX.PlayerData.job2 = job2
end)

RegisterNetEvent('Ise_Logs2')
AddEventHandler('Ise_Logs2', function(Color, Title, Description)
TriggerServerEvent('Ise_Logs2', Color, Title, Description)
Expand Down Expand Up @@ -1850,4 +1832,4 @@ Citizen.CreateThread(function()
end)
end
end
end)
end)
2 changes: 0 additions & 2 deletions config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Config = {}

Config = {
------------
ESXTrigger = "esx:getSharedObject",
------------
ColorMenuR = 255, -- Bannière couleur R
ColorMenuG = 11, -- Bannière couleur G
Expand Down
5 changes: 4 additions & 1 deletion fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ server_scripts {
"config.lua",
}

shared_script "config.lua"
shared_script {
"config.lua",
"@es_extended/imports.lua",
}

client_scripts {
"src/RMenu.lua",
Expand Down
9 changes: 0 additions & 9 deletions report.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
if Config.Report == true then
ESX = nil

Citizen.CreateThread(function()
while ESX == nil do
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
Citizen.Wait(100)
end
end)


RegisterNetEvent("finalmenuadmin:sendNotifForReport")
AddEventHandler("finalmenuadmin:sendNotifForReport", function(type, nomdumec, raisondumec)
Expand Down
4 changes: 1 addition & 3 deletions server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
ESX = nil
local allReport = {}
local items = {}

TriggerEvent(Config.ESXTrigger, function(obj) ESX = obj end)

ESX.RegisterServerCallback('BahFaut:getUsergroup', function(source, cb)
local xPlayer = ESX.GetPlayerFromId(source)
Expand Down Expand Up @@ -318,4 +316,4 @@ function Ise_Logs3(webhook3, Color, Title, Description)
}
}
PerformHttpRequest(webhook3, function(err, text, headers) end, 'POST', json.encode({username = Name, embeds = Content}), { ['Content-Type'] = 'application/json' })
end
end