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

tweak: remove exploitable events & fix max weight

Browse Source
This commit is contained in:
Mycroft
2022-08-30 20:10:29 +01:00
parent 428b0d65d8
commit d974204918
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/main.lua
+6 -6
View File
@@ -17,7 +17,7 @@ RegisterNetEvent('esx:playerLoaded')
AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin)
ESX.PlayerLoaded = true
ESX.PlayerData = xPlayer
ESX.PlayerData.ped = PlayerPedId()
FreezeEntityPosition(ESX.PlayerData.ped, true)
if Config.Multichar then
@@ -132,7 +132,7 @@ AddEventHandler('esx:onPlayerLogout', function()
end)
RegisterNetEvent('esx:setMaxWeight')
AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.PlayerData.maxWeight = newMaxWeight end)
AddEventHandler('esx:setMaxWeight', function(newMaxWeight) ESX.SetPlayerData("maxWeight", newMaxWeight) end)
local function onPlayerSpawn()
if ESX.PlayerLoaded then
@@ -244,23 +244,23 @@ if not Config.OxInventory then
RegisterNetEvent('esx:addWeapon')
AddEventHandler('esx:addWeapon', function(weapon, ammo)
GiveWeaponToPed(ESX.PlayerData.ped, joaat(weapon), ammo, false, false)
print("[WARNING] event 'esx:addWeapon' is deprecated. Please use xPlayer.addWeapon Instead!")
end)
RegisterNetEvent('esx:addWeaponComponent')
AddEventHandler('esx:addWeaponComponent', function(weapon, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weapon, weaponComponent).hash
GiveWeaponComponentToPed(ESX.PlayerData.ped, joaat(weapon), componentHash)
print("[WARNING] event 'esx:addWeaponComponent' is deprecated. Please use xPlayer.addWeaponComponent Instead!")
end)
RegisterNetEvent('esx:setWeaponAmmo')
AddEventHandler('esx:setWeaponAmmo', function(weapon, weaponAmmo)
SetPedAmmo(ESX.PlayerData.ped, joaat(weapon), weaponAmmo)
print("[WARNING] event 'esx:setWeaponAmmo' is deprecated. Please use xPlayer.addWeaponComponent Instead!")
end)
RegisterNetEvent('esx:setWeaponTint')
AddEventHandler('esx:setWeaponTint', function(weapon, weaponTintIndex)
SetPedWeaponTintIndex(ESX.PlayerData.ped, joaat(weapon), weaponTintIndex)
end)
RegisterNetEvent('esx:removeWeapon')
[esx]/es_extended/server/classes/player.lua
+4 -3
View File
@@ -366,7 +366,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
tintIndex = 0
})
self.triggerEvent('esx:addWeapon', weaponName, ammo)
GiveWeaponToPed(GetPlayerPed(self.source), joaat(weaponName), ammo, false, false)
self.triggerEvent('esx:addInventoryItem', weaponLabel, false, true)
end
end
@@ -380,7 +380,8 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
if component then
if not self.hasWeaponComponent(weaponName, weaponComponent) then
self.loadout[loadoutNum].components[#self.loadout[loadoutNum].components + 1] = weaponComponent
self.triggerEvent('esx:addWeaponComponent', weaponName, weaponComponent)
local componentHash = ESX.GetWeaponComponent(weapon, weaponComponent).hash
GiveWeaponComponentToPed(GetPlayerPed(self.source), joaat(weapon), componentHash)
self.triggerEvent('esx:addInventoryItem', component.label, false, true)
end
end
@@ -392,7 +393,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
if weapon then
weapon.ammo = weapon.ammo + ammoCount
self.triggerEvent('esx:setWeaponAmmo', weaponName, weapon.ammo)
SetPedAmmo(GetPlayerPed(self.source), joaat(weaponName), weapon.ammo)
end
end
[esx]/es_extended/server/functions.lua
+6 -4
View File
@@ -339,14 +339,16 @@ function ESX.SetPlayerFunctionOverride(index)
end
function ESX.GetItemLabel(item)
if ESX.Items[item] then
return ESX.Items[item].label
end
if Config.OxInventory then
item = exports.ox_inventory:Items(item)
if item then return item.label end
end
if ESX.Items[item] then
return ESX.Items[item].label
else
print('[^3WARNING^7] Attemting to get invalid Item -> '..item )
end
end
function ESX.GetJobs()