Merge pull request #31 from Uniixx/main

Fix looping music #30
marcostom32 · Nov 8, 2023 · d2d67ff · d2d67ff
2 parents 172cee9 + c7db34d
commit d2d67ff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/client/main.lua b/client/main.lua
@@ -108,6 +108,9 @@ end)
 
 RegisterNUICallback('closeUI', function(_, cb)
     openCharMenu(false)
+    SendNUIMessage({
+        action = "stopMusic"
+    })
     cb("ok")
 end)
 
@@ -121,8 +124,12 @@ end)
 RegisterNUICallback('selectCharacter', function(data, cb)
     local cData = data.cData
     DoScreenFadeOut(10)
+    cData.isNew = false
     TriggerServerEvent('qb-multicharacter:server:loadUserData', cData)
     openCharMenu(false)
+    SendNUIMessage({
+        action = "stopMusic"
+    })
     SetEntityAsMissionEntity(charPed, true, true)
     DeleteEntity(charPed)
     cb("ok")
@@ -239,7 +246,11 @@ RegisterNUICallback('createNewCharacter', function(data, cb)
     elseif cData.gender == Lang:t("ui.female") then
         cData.gender = 1
     end
+    cData.isNew = true
     TriggerServerEvent('qb-multicharacter:server:createCharacter', cData)
+    SendNUIMessage({
+        action = "stopMusic"
+    })
     Wait(500)
     cb("ok")
 end)

diff --git a/server/main.lua b/server/main.lua
@@ -109,7 +109,7 @@ RegisterNetEvent('qb-multicharacter:server:createCharacter', function(data)
         repeat
             Wait(10)
         until hasDonePreloading[src]
-        if Apartments.Starting then
+        if data.isNew then
             local randbucket = (GetPlayerPed(src) .. math.random(1,999))
             SetPlayerRoutingBucket(src, randbucket)
             print('^2[qb-core]^7 '..GetPlayerName(src)..' has succesfully loaded!')