Merge branch 'main' of https://github.com/qbcore-framework/qb-core

client/loops.lua

@@ -1,7 +1,7 @@
 CreateThread(function()
     while true do
         Wait(0)
-        if LocalPlayer.state['isLoggedIn'] then
+        if LocalPlayer.state.isLoggedIn then
             Wait((1000 * 60) * QBCore.Config.UpdateInterval)
             TriggerServerEvent('QBCore:UpdatePlayer')
         end
@@ -11,7 +11,7 @@ end)
 CreateThread(function()
     while true do
         Wait(QBCore.Config.StatusInterval)
-        if LocalPlayer.state['isLoggedIn'] then
+        if LocalPlayer.state.isLoggedIn then
             if QBCore.Functions.GetPlayerData().metadata['hunger'] <= 0 or
                     QBCore.Functions.GetPlayerData().metadata['thirst'] <= 0 then
                 local ped = PlayerPedId()
@@ -20,4 +20,4 @@ CreateThread(function()
             end
         end
     end
-end)
+end)

server/commands.lua

@@ -214,7 +214,7 @@ end, 'user')
 
 -- Me command
 
-QBCore.Commands.Add('me', 'Show local message', {name = 'message', help = 'Message to respond with'}, false, function(source, args)
+QBCore.Commands.Add('me', 'Show local message', {{name = 'message', help = 'Message to respond with'}}, false, function(source, args)
     local src = source
     local ped = GetPlayerPed(src)
     local pCoords = GetEntityCoords(ped)

server/player.lua

@@ -9,9 +9,9 @@ function QBCore.Player.Login(source, citizenid, newData)
     local src = source
     if src then
         if citizenid then
-            local result = exports.oxmysql:executeSync('SELECT * FROM players WHERE citizenid = ?', { citizenid })
-            local PlayerData = result[1]
-            if PlayerData then
+            local license = QBCore.Functions.GetIdentifier(src, 'license')
+            local PlayerData = exports.oxmysql:singleSync('SELECT * FROM players where citizenid = ?', { citizenid })
+            if PlayerData and license == PlayerData.license then
                 PlayerData.money = json.decode(PlayerData.money)
                 PlayerData.job = json.decode(PlayerData.job)
                 PlayerData.position = json.decode(PlayerData.position)
@@ -22,8 +22,11 @@ function QBCore.Player.Login(source, citizenid, newData)
                 else
                     PlayerData.gang = {}
                 end
+                QBCore.Player.CheckPlayerData(src, PlayerData)
+            else
+                DropPlayer(src, 'You Have Been Kicked For Exploitation')
+                TriggerEvent('qb-log:server:CreateLog', 'anticheat', 'Anti-Cheat', 'white', GetPlayerName(src) .. ' Has Been Dropped For Character Joining Exploit', false)
             end
-            QBCore.Player.CheckPlayerData(src, PlayerData)
         else
             QBCore.Player.CheckPlayerData(src, newData)
         end