mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-09-04 16:23:21 +00:00
tweak(es_extended): better prints + esx:getSharedObject deprecation
https://docs.esx-framework.org/tutorials/sharedevent
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
AddEventHandler('esx:getSharedObject', function(cb)
|
AddEventHandler('esx:getSharedObject', function(cb)
|
||||||
cb(ESX)
|
local Invoke = GetInvokingResource()
|
||||||
|
print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke))
|
||||||
|
cb(ESX)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
exports('getSharedObject', function()
|
exports('getSharedObject', function()
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ Core.PickupId = 0
|
|||||||
Core.PlayerFunctionOverrides = {}
|
Core.PlayerFunctionOverrides = {}
|
||||||
|
|
||||||
AddEventHandler('esx:getSharedObject', function(cb)
|
AddEventHandler('esx:getSharedObject', function(cb)
|
||||||
|
local Invoke = GetInvokingResource()
|
||||||
|
print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke))
|
||||||
cb(ESX)
|
cb(ESX)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ function createESXPlayer(identifier, playerId, data)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if Core.IsPlayerAdmin(playerId) then
|
if Core.IsPlayerAdmin(playerId) then
|
||||||
print(('^2[INFO] ^0 Player ^5%s ^0Has been granted admin permissions via ^5Ace Perms.^7'):format(playerId))
|
print(('[^2INFO^0] Player ^5%s^0 Has been granted admin permissions via ^5Ace Perms^7.'):format(playerId))
|
||||||
defaultGroup = "admin"
|
defaultGroup = "admin"
|
||||||
else
|
else
|
||||||
defaultGroup = "user"
|
defaultGroup = "user"
|
||||||
@@ -145,7 +145,7 @@ function loadESXPlayer(identifier, playerId, isNew)
|
|||||||
if ESX.DoesJobExist(job, grade) then
|
if ESX.DoesJobExist(job, grade) then
|
||||||
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
|
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
|
||||||
else
|
else
|
||||||
print(('[^3WARNING^7] Ignoring invalid job for %s [job: %s, grade: %s]'):format(identifier, job, grade))
|
print(('[^3WARNING^7] Ignoring invalid job for ^5%s^7 [job: ^5%s^7, grade: ^5%s^7]'):format(identifier, job, grade))
|
||||||
job, grade = 'unemployed', '0'
|
job, grade = 'unemployed', '0'
|
||||||
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
|
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
|
||||||
end
|
end
|
||||||
@@ -180,7 +180,7 @@ function loadESXPlayer(identifier, playerId, isNew)
|
|||||||
if item then
|
if item then
|
||||||
foundItems[name] = count
|
foundItems[name] = count
|
||||||
else
|
else
|
||||||
print(('[^3WARNING^7] Ignoring invalid item "%s" for "%s"'):format(name, identifier))
|
print(('[^3WARNING^7] Ignoring invalid item ^5"%s"^7 for ^5"%s^7"'):format(name, identifier))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -211,7 +211,7 @@ function loadESXPlayer(identifier, playerId, isNew)
|
|||||||
if result.group then
|
if result.group then
|
||||||
if result.group == "superadmin" then
|
if result.group == "superadmin" then
|
||||||
userData.group = "admin"
|
userData.group = "admin"
|
||||||
print("[^3WARNING^7] Superadmin detected, setting group to admin")
|
print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
|
||||||
else
|
else
|
||||||
userData.group = result.group
|
userData.group = result.group
|
||||||
end
|
end
|
||||||
@@ -319,7 +319,7 @@ function loadESXPlayer(identifier, playerId, isNew)
|
|||||||
end
|
end
|
||||||
|
|
||||||
xPlayer.triggerEvent('esx:registerSuggestions', Core.RegisteredCommands)
|
xPlayer.triggerEvent('esx:registerSuggestions', Core.RegisteredCommands)
|
||||||
print(('[^2INFO^0] Player ^5"%s" ^0has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId))
|
print(('[^2INFO^0] Player ^5"%s"^0 has connected to the server. ID: ^5%s^7'):format(xPlayer.getName(), playerId))
|
||||||
end
|
end
|
||||||
|
|
||||||
AddEventHandler('chatMessage', function(playerId, author, message)
|
AddEventHandler('chatMessage', function(playerId, author, message)
|
||||||
@@ -386,7 +386,7 @@ if not Config.OxInventory then
|
|||||||
local targetXPlayer = ESX.GetPlayerFromId(target)
|
local targetXPlayer = ESX.GetPlayerFromId(target)
|
||||||
local distance = #(GetEntityCoords(GetPlayerPed(playerId)) - GetEntityCoords(GetPlayerPed(target)))
|
local distance = #(GetEntityCoords(GetPlayerPed(playerId)) - GetEntityCoords(GetPlayerPed(target)))
|
||||||
if not sourceXPlayer or not targetXPlayer or distance > Config.DistanceGive then
|
if not sourceXPlayer or not targetXPlayer or distance > Config.DistanceGive then
|
||||||
print("[WARNING] Player Detected Cheating: " .. GetPlayerName(playerId))
|
print("[^3WARNING^7] Player Detected Cheating: ^5" .. GetPlayerName(playerId) .. "^7")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user