rf: use callback to set the players phone number

-> avoids removing item if failed
Maximus7474 · Dec 21, 2024 · ce1b505 · ce1b505
1 parent 820ec26
commit ce1b505
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -1,6 +1,6 @@
 local lbphone = exports['lb-phone']
 
-RegisterNetEvent('lbphonesim:changingsimcard', function (newNumber)
+lib.callback.register('lbphonesim:changingsimcard', function (newNumber)
     if lbphone:IsOpen() then
         lbphone:ToggleOpen(false, false)
     end
@@ -11,12 +11,14 @@ RegisterNetEvent('lbphonesim:changingsimcard', function (newNumber)
     end)
     if not status then
         lib.print.error(T('DEBUG.SETTING_NUMBER_FAILED'), err)
-        return
+        return err
     end
 
     lbphone:SendNotification({
         app = "Settings",
         title = T('NOTIFICATIONS.NUMBER_CHANGED.TITLE'),
         content = T('NOTIFICATIONS.NUMBER_CHANGED.DESCRIPTION', {number = lbphone:FormatNumber(newNumber)}),
     })
+
+    return true
 end)
diff --git a/server/main.lua b/server/main.lua
@@ -13,8 +13,6 @@ if Inventory.RegisterItemCB then
 
             if Config.SimCard.ReplaceSimCardNumber then
                 Inventory.UpdateSimCardNumber(source, slot, currentNumber)
-            elseif Config.SimCard.DeleteSimCard then
-                Inventory.RemoveItem(source, slot)
             end
             local success = false
             if Config.Item.Unique then
@@ -36,7 +34,18 @@ if Inventory.RegisterItemCB then
                 success = rows == 1
             end
 
-            if success then TriggerClientEvent('lbphonesim:changingsimcard', source, newNumber or Utils.GenerateNewNumber()) end
+            if not success then return end
+
+            lib.callback('lbphonesim:changingsimcard', source, function (response)
+                if response == true then
+                    if Config.SimCard.DeleteSimCard then
+                        Inventory.RemoveItem(source, slot)
+                    end
+                    return
+                end
+
+                lib.print.error('Unable to change phone number for ' .. source .. ', failed with error:', response)
+            end, newNumber or Utils.GenerateNewNumber())
         end
     )
 elseif Framework.RegisterUsableItem then