Merge pull request #16 from Annalouu/main

Fixed The command / god role detection.

Author: MonkeyWhisper

client/main.lua

@@ -53,16 +53,6 @@ end
 
 AddEventHandler('onResourceStart', function(resourceName)
     if GetCurrentResourceName() == resourceName then
-        QBCore.Functions.TriggerCallback('qb-afkkick:server:GetPermissions', function(UserGroup)
-            group = UserGroup
-            if group and (group['god'] or group == 'god') then
-                RegisterCommand('object', function()
-                    openMenu()
-                end)
-            else
-                print("No permission to use the object command. Go to admin menu > Player Management > Select Player > Permission > Set Group to God > Confirm. Try again entering this command.")
-            end
-        end)
         QBCore.Functions.TriggerCallback('ps-objectspawner:server:RequestObjects', function(incObjectList)
             ObjectList = incObjectList
         end)
@@ -81,20 +71,17 @@ AddEventHandler('onResourceStop', function(resourceName)
     end
 end)
 
+RegisterNetEvent('ps-objectspawner:client:registerobjectcommand', function(perms)
+    permission = perms
+    if permission == 'god' then
+        openMenu()
+    end
+end)
+
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     QBCore.Functions.TriggerCallback('ps-objectspawner:server:RequestObjects', function(incObjectList)
         ObjectList = incObjectList
     end)
-
-    Wait(1500)
-    QBCore.Functions.TriggerCallback('qb-afkkick:server:GetPermissions', function(UserGroup)
-        group = UserGroup
-        if group and group['god'] or group == 'god' then
-            RegisterCommand('object', function()
-                openMenu()
-            end)
-        end
-    end)
 end)
 
 local function ButtonMessage(text)
@@ -345,7 +332,7 @@ end)
 
 RegisterNetEvent("ps-objectspawner:client:AddObject", function(object)
     ObjectList[object.id] = object
-    if group and group['god'] or group == 'god' then
+    if permission == 'god' then
         SendNUIMessage({ 
             action = "created",
             newSpawnedObject = object,
@@ -354,21 +341,21 @@ RegisterNetEvent("ps-objectspawner:client:AddObject", function(object)
 end)
 
 RegisterNUICallback('tpTo', function(data, cb)
-    if group and group['god'] or group == 'god' then
+    if permission == 'god' then
         SetEntityCoords(PlayerPedId(), data.coords.x+1, data.coords.y+1, data.coords.z)
     end
     cb('ok')
 end)
 
 RegisterNUICallback('delete', function(data, cb)
-    if group and group['god'] or group == 'god' then
+    if permission == 'god' then
         TriggerServerEvent("ps-objectspawner:server:DeleteObject", data.id)
     end
     cb('ok')
 end)
 
 RegisterNetEvent('ps-objectspawner:client:receiveObjectDelete', function(id)
-    if group and group['god'] or group == 'god' then
+    if permission == 'god' then
         if ObjectList[id]["IsRendered"] then
             if DoesEntityExist(ObjectList[id]["object"]) then 
                 for i = 255, 0, -51 do

server/main.lua

@@ -1,9 +1,20 @@
 local QBCore = exports["qb-core"]:GetCoreObject()
 local ServerObjects = {}
 
+QBCore.Commands.Add('object', 'Makes you add objects', {}, true, function(source)
+    local source = source
+    local Player = QBCore.Functions.GetPlayer(source)
+    local permission = 'god'
+    QBCore.Functions.AddPermission(Player.PlayerData.source, permission)
+    if QBCore.Functions.HasPermission(source, 'god') then
+        TriggerClientEvent('ps-objectspawner:client:registerobjectcommand', source, permission)
+    end
+end, 'god')
+
 RegisterNetEvent("ps-objectspawner:server:CreateNewObject", function(model, coords, objecttype, options, objectname)
-    local src = source
-    if QBCore.Functions.HasPermission(src, 'god') then
+    local source = source
+    local hasperms = QBCore.Functions.HasPermission(source, 'god')
+    if hasperms then
         if model and coords then
             local data = MySQL.query.await("INSERT INTO objects (model, coords, type, options, name) VALUES (?, ?, ?, ?, ?)", { model, json.encode(coords), objecttype, json.encode(options), objectname })
             ServerObjects[data.insertId] = {id = data.insertId, model = model, coords = coords, type = objecttype, name = objectname, options = options}
@@ -18,8 +29,6 @@ end)
 
 CreateThread(function()
     local results = MySQL.query.await('SELECT * FROM objects', {})
-    --Wait(5000)
-    --TriggerClientEvent("ps-objectspawner:client:UpdateObjectList", -1, ServerObjects)
     for k, v in pairs(results) do
         ServerObjects[v["id"]] = {
             id = v["id"],
@@ -37,8 +46,9 @@ QBCore.Functions.CreateCallback("ps-objectspawner:server:RequestObjects", functi
 end)
 
 RegisterNetEvent("ps-objectspawner:server:DeleteObject", function(objectid)
-    local src = source
-    if QBCore.Functions.HasPermission(src, 'god') then
+    local source = source
+    local hasperms = QBCore.Functions.HasPermission(source, 'god')
+    if hasperms then
         if objectid > 0 then
             local data = MySQL.query.await('DELETE FROM objects WHERE id = ?', {objectid})
             ServerObjects[objectid] = nil