Skip to content

Commit

Permalink
Merge pull request #16 from bitpredator/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
bitpredator authored Sep 2, 2023
2 parents c236156 + f50aebc commit 09de8dc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions client/common.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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://documentation.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke))
print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://bitpredator.github.io/bptdevelopment/docs/esx-tutorial/sharedevent^7 for more info!'):format(Invoke))
cb(ESX)
end)

Expand All @@ -10,4 +10,4 @@ end)

if GetResourceState('ox_inventory') ~= 'missing' then
Config.OxInventory = true
end
end
4 changes: 2 additions & 2 deletions server/classes/player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local GetEntityCoords = GetEntityCoords

function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, weight, job, loadout, name, coords, metadata)
local targetOverrides = Config.PlayerFunctionOverride and Core.PlayerFunctionOverrides[Config.PlayerFunctionOverride] or {}

local self = {}

self.accounts = accounts
Expand All @@ -23,7 +23,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
if Config.Multichar then self.license = 'license'.. identifier:sub(identifier:find(':'), identifier:len()) else self.license = 'license:'..identifier end

ExecuteCommand(('add_principal identifier.%s group.%s'):format(self.license, self.group))

local stateBag = Player(self.source).state
stateBag:set("identifier", self.identifier, true)
stateBag:set("license", self.license, true)
Expand Down
2 changes: 1 addition & 1 deletion server/functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ end
function ESX.GetIdentifier(playerId)
local fxDk = GetConvarInt('sv_fxdkMode', 0)
if fxDk == 1 then
return "ESX-DEBUG-LICENCE"
return "BPT-DEBUG-LICENCE"
end
for _, v in ipairs(GetPlayerIdentifiers(playerId)) do
if string.match(v, 'license:') then
Expand Down

0 comments on commit 09de8dc

Please sign in to comment.