starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 18:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/1148' into legacy

Browse Source
This commit is contained in:
Linden
2021-05-16 19:31:19 +10:00
parent a3d9e83988 0a70609741
commit 08088cc82a
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+23 -20
View File
@@ -66,9 +66,6 @@ AddEventHandler('esx:playerLoaded', function(playerData, isNew)
TriggerEvent('skinchanger:loadSkin', skin)
end)
end
if Config.EnableHud then
ESX.UI.HUD.SetDisplay(1.0)
end
TriggerEvent('esx:loadingScreenOff') -- compatibility with old scripts, will be removed soon.
end)
@@ -169,40 +166,40 @@ AddEventHandler('esx:removeInventoryItem', function(item, count, showNotificatio
end)
RegisterNetEvent('esx:addWeapon')
AddEventHandler('esx:addWeapon', function(weaponName, ammo)
AddEventHandler('esx:addWeapon', function(weapon, ammo)
-- Removed PlayerPedId() from being stored in a variable, not needed
-- when it's only being used once, also doing it in a few
-- functions below this one
GiveWeaponToPed(PlayerPedId(), weaponName, ammo, false, false)
GiveWeaponToPed(PlayerPedId(), GetHashKey(weapon), ammo, false, false)
end)
RegisterNetEvent('esx:addWeaponComponent')
AddEventHandler('esx:addWeaponComponent', function(weaponName, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weaponName, weaponComponent).hash
GiveWeaponComponentToPed(PlayerPedId(), weaponName, componentHash)
AddEventHandler('esx:addWeaponComponent', function(weapon, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weapon, weaponComponent).hash
GiveWeaponComponentToPed(PlayerPedId(), GetHashKey(weapon), componentHash)
end)
RegisterNetEvent('esx:setWeaponAmmo')
AddEventHandler('esx:setWeaponAmmo', function(weaponName, weaponAmmo)
SetPedAmmo(PlayerPedId(), weaponName, weaponAmmo)
AddEventHandler('esx:setWeaponAmmo', function(weapon, weaponAmmo)
SetPedAmmo(PlayerPedId(), GetHashKey(weapon), weaponAmmo)
end)
RegisterNetEvent('esx:setWeaponTint')
AddEventHandler('esx:setWeaponTint', function(weaponName, weaponTintIndex)
SetPedWeaponTintIndex(PlayerPedId(), weaponName, weaponTintIndex)
AddEventHandler('esx:setWeaponTint', function(weapon, weaponTintIndex)
SetPedWeaponTintIndex(PlayerPedId(), GetHashKey(weapon), weaponTintIndex)
end)
RegisterNetEvent('esx:removeWeapon')
AddEventHandler('esx:removeWeapon', function(weaponName)
AddEventHandler('esx:removeWeapon', function(weapon)
local playerPed = PlayerPedId()
RemoveWeaponFromPed(playerPed, weaponName)
SetPedAmmo(playerPed, weaponName, 0)
RemoveWeaponFromPed(playerPed, GetHashKey(weapon))
SetPedAmmo(playerPed, GetHashKey(weapon), 0)
end)
RegisterNetEvent('esx:removeWeaponComponent')
AddEventHandler('esx:removeWeaponComponent', function(weaponName, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weaponName, weaponComponent).hash
RemoveWeaponComponentFromPed(PlayerPedId(), weaponName, componentHash)
AddEventHandler('esx:removeWeaponComponent', function(weapon, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weapon, weaponComponent).hash
RemoveWeaponComponentFromPed(PlayerPedId(), GetHashKey(weapon), componentHash)
end)
RegisterNetEvent('esx:teleport')
@@ -225,11 +222,13 @@ end)
RegisterNetEvent('esx:spawnVehicle')
AddEventHandler('esx:spawnVehicle', function(vehicle)
if IsModelInCdimage(vehicle) then
local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle))
if IsModelInCdimage(model) then
local playerPed = PlayerPedId()
local playerCoords, playerHeading = GetEntityCoords(playerPed), GetEntityHeading(playerPed)
ESX.Game.SpawnVehicle(vehicle, playerCoords, playerHeading, function(vehicle)
ESX.Game.SpawnVehicle(model, playerCoords, playerHeading, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
end)
else
@@ -348,6 +347,10 @@ if Config.EnableHud then
end
end
end)
AddEventHandler('esx:loadingScreenOff', function()
ESX.UI.HUD.SetDisplay(1.0)
end)
end
function StartServerSyncLoops()