Merge pull request #155 from Renewed-Scripts/main

Merge v1 fixes into v2
Renewed-Scripts · Dec 5, 2023 · 937009b · 937009b
2 parents 330b7ae + b93c6a3
commit 937009b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -418,7 +418,7 @@ RegisterCommand('phone', function()
 end, false) RegisterKeyMapping('phone', 'Open Phone', 'keyboard', 'M')
 
 RegisterCommand("+answer", function()
-    if (PhoneData.CallData.CallType == "incoming" or PhoneData.CallData.CallType == "outgoing" and not PhoneData.CallData.CallType == "ongoing") then
+    if (PhoneData.CallData.CallType == "incoming" or PhoneData.CallData.CallType == "outgoing") and PhoneData.CallData.CallType ~= "ongoing" then
         if not PlayerData.metadata['ishandcuffed'] and not PlayerData.metadata['inlaststand'] and not PlayerData.metadata['isdead'] and not IsPauseMenuActive() and hasPhone() then
             AnswerCall()
         else

diff --git a/server/documents.lua b/server/documents.lua
@@ -127,6 +127,7 @@ RegisterNetEvent('qb-phone:server:documents_Save_Note_As', function(data, Receiv
         end
     end
 
+    Wait(250)
     local Notes = exports.oxmysql:executeSync('SELECT * FROM phone_note WHERE citizenid = ?', {CID})
     Wait(100)
     TriggerClientEvent('qb-phone:RefReshNotes_Free_Documents', src, Notes)

diff --git a/server/employment.lua b/server/employment.lua
@@ -126,8 +126,8 @@ RegisterNetEvent('qb-phone:server:fireUser', function(Job, sCID)
 
     local grade = tostring(CachedJobs[Job].employees[srcCID].grade)
     if not QBCore.Shared.Jobs[Job].grades[grade].isboss then return end
-
-    if CachedJobs[Job].employees[srcCID].grade < CachedJobs[Job].employees[CID].grade then return end
+    -- for some reason the line next doesnt like being compared to each other even tho they are both numbers so i had to use tonumber
+    if tonumber(CachedJobs[Job].employees[srcCID].grade) < tonumber(CachedJobs[Job].employees[CID].grade) then return end
 
 
     CachedJobs[Job].employees[CID] = nil