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

tweak(es_extended): better prints + esx:getSharedObject deprecation

Browse Source 
https://docs.esx-framework.org/tutorials/sharedevent
This commit is contained in:
Mycroft
2022-09-18 05:55:56 +01:00
parent b8f1f6b7cc
commit f289e42340
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/common.lua
+3 -1
View File
@@ -1,5 +1,7 @@
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)
exports('getSharedObject', function()
[esx]/es_extended/server/common.lua
+2
View File
@@ -13,6 +13,8 @@ Core.PickupId = 0
Core.PlayerFunctionOverrides = {}
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)
end)
[esx]/es_extended/server/main.lua
+6 -6
View File
@@ -72,7 +72,7 @@ function createESXPlayer(identifier, playerId, data)
end
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"
else
defaultGroup = "user"
@@ -145,7 +145,7 @@ function loadESXPlayer(identifier, playerId, isNew)
if ESX.DoesJobExist(job, grade) then
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
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'
jobObject, gradeObject = ESX.Jobs[job], ESX.Jobs[job].grades[grade]
end
@@ -180,7 +180,7 @@ function loadESXPlayer(identifier, playerId, isNew)
if item then
foundItems[name] = count
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
@@ -211,7 +211,7 @@ function loadESXPlayer(identifier, playerId, isNew)
if result.group then
if result.group == "superadmin" then
userData.group = "admin"
print("[^3WARNING^7] Superadmin detected, setting group to admin")
print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
else
userData.group = result.group
end
@@ -319,7 +319,7 @@ function loadESXPlayer(identifier, playerId, isNew)
end
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
AddEventHandler('chatMessage', function(playerId, author, message)
@@ -386,7 +386,7 @@ if not Config.OxInventory then
local targetXPlayer = ESX.GetPlayerFromId(target)
local distance = #(GetEntityCoords(GetPlayerPed(playerId)) - GetEntityCoords(GetPlayerPed(target)))
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
end