From cc0e2d2bf5230de6746a4ab128456f9ce46dedab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Burak=20G=C3=BCne=C5=9F?= Date: Wed, 29 Jan 2025 17:04:38 +0300 Subject: [PATCH] new playerid compatibility --- client/client.lua | 3 ++- server/server.lua | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/client/client.lua b/client/client.lua index 7fe3e96..1d2daa6 100644 --- a/client/client.lua +++ b/client/client.lua @@ -626,7 +626,8 @@ local function OpenBanMenu(banplayer) end local function OpenPlayerMenus(player) - local Players = MenuV:CreateMenu(false, player.cid .. Lang:t('info.options'), menuLocation, 220, 20, 60, 'size-125', 'none', 'menuv') -- Players Sub Menu + local menuHeader = ("[%s] %s %s"):format(player.playerid, player.cid, Lang:t('info.options')) + local Players = MenuV:CreateMenu(false, menuHeader, menuLocation, 220, 20, 60, 'size-125', 'none', 'menuv') -- Players Sub Menu Players:ClearItems() MenuV:OpenMenu(Players) local elements = { diff --git a/server/server.lua b/server/server.lua index 3c1d8b5..52bd4a3 100644 --- a/server/server.lua +++ b/server/server.lua @@ -20,7 +20,7 @@ local permissions = { function GetQBPlayers() local playerReturn = {} local players = QBCore.Functions.GetQBPlayers() - + for id, player in pairs(players) do local playerPed = GetPlayerPed(id) local name = (player.PlayerData.charinfo.firstname or '') .. ' ' .. (player.PlayerData.charinfo.lastname or '') @@ -29,6 +29,7 @@ function GetQBPlayers() id = id, coords = GetEntityCoords(playerPed), cid = name, + playerid = player.PlayerData.playerid, citizenid = player.PlayerData.citizenid, sources = playerPed, sourceplayer = id @@ -44,7 +45,7 @@ end) -- Get Players QBCore.Functions.CreateCallback('test:getplayers', function(_, cb) -- WORKS - local players = GetQBPlayers() + local players = GetQBPlayers() cb(players) end) @@ -380,11 +381,13 @@ QBCore.Commands.Add('givenuifocus', Lang:t('commands.nui_focus'), { { name = 'id local playerid = tonumber(args[1]) local focus = args[2] local mouse = args[3] - TriggerClientEvent('qb-admin:client:GiveNuiFocus', playerid, focus, mouse) + local Player = QBCore.Functions.GetPlayerByPlayerId(playerid) + if not Player then return end + TriggerClientEvent('qb-admin:client:GiveNuiFocus', Player.PlayerData.source, focus, mouse) end, 'admin') QBCore.Commands.Add('warn', Lang:t('commands.warn_a_player'), { { name = 'ID', help = 'Player' }, { name = 'Reason', help = 'Mention a reason' } }, true, function(source, args) - local targetPlayer = QBCore.Functions.GetPlayer(tonumber(args[1])) + local targetPlayer = QBCore.Functions.GetPlayerByPlayerId(tonumber(args[1])) local senderPlayer = QBCore.Functions.GetPlayer(source) table.remove(args, 1) local msg = table.concat(args, ' ') @@ -405,11 +408,11 @@ end, 'admin') QBCore.Commands.Add('checkwarns', Lang:t('commands.check_player_warning'), { { name = 'id', help = 'Player' }, { name = 'Warning', help = 'Number of warning, (1, 2 or 3 etc..)' } }, false, function(source, args) if args[2] == nil then - local targetPlayer = QBCore.Functions.GetPlayer(tonumber(args[1])) + local targetPlayer = QBCore.Functions.GetPlayerByPlayerId(tonumber(args[1])) local result = MySQL.query.await('SELECT * FROM player_warns WHERE targetIdentifier = ?', { targetPlayer.PlayerData.license }) TriggerClientEvent('chat:addMessage', source, 'SYSTEM', 'warning', targetPlayer.PlayerData.name .. ' has ' .. tablelength(result) .. ' warnings!') else - local targetPlayer = QBCore.Functions.GetPlayer(tonumber(args[1])) + local targetPlayer = QBCore.Functions.GetPlayerByPlayerId(tonumber(args[1])) local warnings = MySQL.query.await('SELECT * FROM player_warns WHERE targetIdentifier = ?', { targetPlayer.PlayerData.license }) local selectedWarning = tonumber(args[2]) if warnings[selectedWarning] ~= nil then @@ -420,7 +423,7 @@ QBCore.Commands.Add('checkwarns', Lang:t('commands.check_player_warning'), { { n end, 'admin') QBCore.Commands.Add('delwarn', Lang:t('commands.delete_player_warning'), { { name = 'id', help = 'Player' }, { name = 'Warning', help = 'Number of warning, (1, 2 or 3 etc..)' } }, true, function(source, args) - local targetPlayer = QBCore.Functions.GetPlayer(tonumber(args[1])) + local targetPlayer = QBCore.Functions.GetPlayerByPlayerId(tonumber(args[1])) local warnings = MySQL.query.await('SELECT * FROM player_warns WHERE targetIdentifier = ?', { targetPlayer.PlayerData.license }) local selectedWarning = tonumber(args[2]) if warnings[selectedWarning] ~= nil then @@ -434,7 +437,7 @@ QBCore.Commands.Add('reportr', Lang:t('commands.reply_to_report'), { { name = 'i local playerId = tonumber(args[1]) table.remove(args, 1) local msg = table.concat(args, ' ') - local OtherPlayer = QBCore.Functions.GetPlayer(playerId) + local OtherPlayer = QBCore.Functions.GetPlayerByPlayerId(playerId) if msg == '' then return end if not OtherPlayer then return TriggerClientEvent('QBCore:Notify', src, 'Player is not online', 'error') end if not QBCore.Functions.HasPermission(src, 'admin') or IsPlayerAceAllowed(src, 'command') ~= 1 then return end @@ -459,7 +462,7 @@ QBCore.Commands.Add('setmodel', Lang:t('commands.change_ped_model'), { { name = if target == nil then TriggerClientEvent('qb-admin:client:SetModel', source, tostring(model)) else - local Trgt = QBCore.Functions.GetPlayer(target) + local Trgt = QBCore.Functions.GetPlayerByPlayerId(target) if Trgt ~= nil then TriggerClientEvent('qb-admin:client:SetModel', target, tostring(model)) else