Merge pull request #2 from mri-Qbox-Brasil/dev

Feat: Colocar o player no bucket ao revogar whitelist
mri-Qbox-Brasil · Dec 23, 2024 · 0ac5e78 · 0ac5e78
2 parents 63a2b52 + c7db0d6
commit 0ac5e78
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/client/creator.lua b/client/creator.lua
@@ -19,7 +19,7 @@ end
 
 local function OnExit()
     lib.callback(
-        "mri_Qwhitelist:saveConfig",
+        "mri_Qwhitelist:Server:SaveConfig",
         false,
         function(result)
             return true
@@ -543,7 +543,7 @@ local function AddWhitelist(args)
     if tonumber(identifier) then
         identifier = tonumber(identifier)
     end
-    if lib.callback.await("mri_Qwhitelist:addCitizenship", false, identifier) then
+    if lib.callback.await("mri_Qwhitelist:Server:AddCitizenship", false, identifier) then
         lib.notify({description = "Whitelist adicionada com sucesso!", type = "success"})
     end
     args.callback()
@@ -558,7 +558,7 @@ local function RemoveWhitelist(args)
     if tonumber(identifier) then
         identifier = tonumber(identifier)
     end
-    if lib.callback.await("mri_Qwhitelist:removeCitizenship", false, identifier) then
+    if lib.callback.await("mri_Qwhitelist:Server:RemoveCitizenship", false, identifier) then
         lib.notify({description = "Whitelist revogada com sucesso!", type = "success"})
     end
     args.callback()
@@ -625,7 +625,7 @@ if GetResourceState("mri_Qbox") == "started" then
     )
 else
     lib.callback.register(
-        "mri_Qwhitelist:manageWhitelistMenu",
+        "mri_Qwhitelist:Client:ManageWhitelistMenu",
         function()
             manageCitizenship()
             return true

diff --git a/client/main.lua b/client/main.lua
@@ -77,10 +77,7 @@ local function beginExam()
         local anwserPercentage = ((100 * correctAnswers) / #Config.Questions)
         if anwserPercentage >= Config.Percent then
             showAlertDialog(Config.SuccessHeader, Config.SuccessContent, false, "Jogar")
-            lib.callback.await("mri_Qwhitelist:addCitizenship", false)
-            examCompleted = true
-            Zone:Remove()
-            teleportPlayer(ped, Config.CompletionCoords)
+            lib.callback.await("mri_Qwhitelist:Server:addCitizenship", false)
         else
             showAlertDialog(Config.FailedHeader, Config.FailedContent, false, "Entendi")
         end
@@ -117,14 +114,30 @@ function loadCitizenship()
 end
 
 local function OnPlayerLoaded()
-    Config = lib.callback.await("mri_Qwhitelist:getConfig", false)
-    if not lib.callback.await("mri_Qwhitelist:checkCitizenship", false) then
+    Config = lib.callback.await("mri_Qwhitelist:Server:GetConfig", false)
+    if not lib.callback.await("mri_Qwhitelist:Server:CheckCitizenship", false) then
         if Config.Enabled then
-            loadCitizenship()
+            OnPlayerLoaded()
         end
     end
 end
 
+lib.callback.register(
+    "mri_Qwhitelist:Client:AddCitizenship",
+    function()
+        examCompleted = true
+        Zone:Remove()
+        teleportPlayer(cache.ped, Config.CompletionCoords)
+    end
+)
+
+lib.callback.register(
+    "mri_Qwhitelist:Client:RemoveCitizenship",
+    function()
+        loadCitizenship()
+    end
+)
+
 AddEventHandler(
     "onResourceStart",
     function(resourceName)

diff --git a/server/main.lua b/server/main.lua
@@ -46,6 +46,10 @@ local function SetConfig(data)
 end
 
 local function SetPlayerBucket(target, bucket)
+    local actualBucket = GetPlayerRoutingBucket(target)
+    if actualBucket == bucket then
+        return
+    end
     exports.qbx_core:SetPlayerBucket(target, bucket)
 end
 
@@ -88,14 +92,14 @@ AddEventHandler('onResourceStart', function(resource)
 end)
 
 lib.callback.register(
-    "mri_Qwhitelist:getConfig",
+    "mri_Qwhitelist:Server:GetConfig",
     function(source)
         return Config
     end
 )
 
 lib.callback.register(
-    "mri_Qwhitelist:saveConfig",
+    "mri_Qwhitelist:Server:SaveConfig",
     function(source, data)
         SetConfig(json.encode(data))
         Config = data
@@ -105,7 +109,7 @@ lib.callback.register(
 )
 
 lib.callback.register(
-    "mri_Qwhitelist:checkCitizenship",
+    "mri_Qwhitelist:Server:CheckCitizenship",
     function(source)
         local playerBucket = 1000 + source
         exports.qbx_core:SetPlayerBucket(source, playerBucket)
@@ -121,7 +125,7 @@ lib.callback.register(
 )
 
 lib.callback.register(
-    "mri_Qwhitelist:addCitizenship",
+    "mri_Qwhitelist:Server:AddCitizenship",
     function(source, identifier)
 
         local player = GetPlayer(identifier or source, identifier and source or nil)
@@ -138,12 +142,13 @@ lib.callback.register(
         end
 
         SetPlayerBucket(player.PlayerData.source, 0)
+        lib.callback.await("mri_Qwhitelist:Client:AddCitizenship", player.PlayerData.source, false)
         return status
     end
 )
 
 lib.callback.register(
-    "mri_Qwhitelist:removeCitizenship",
+    "mri_Qwhitelist:Server:RemoveCitizenship",
     function(source, identifier)
 
         local player = GetPlayer(identifier)
@@ -157,6 +162,8 @@ lib.callback.register(
             lib.notify(source, {description = "Erro ao revogar whitelist, verifique o console para mais informações.", type = "error", duration = 5000})
         end
 
+        SetPlayerBucket(player.PlayerData.source, 1000 + player.PlayerData.source)
+        lib.callback.await("mri_Qwhitelist:Client:RemoveCitizenship", player.PlayerData.source, false)
         return status
     end
 )