Live map

client/main.lua

@@ -77,3 +77,9 @@ RegisterNUICallback("getPlayers", function(data, cb)
 	local players = lib.callback.await('ps-adminmenu:callback:GetPlayers', false)
 	cb(players)
 end)
+
+-- Get players pos
+RegisterNUICallback("getPlayersPos", function(data, cb)
+	local locations = lib.callback.await('ps-adminmenu:callback:GetPlayersPos', false)
+	cb(locations)
+end)

server/misc.lua

@@ -77,16 +77,23 @@ RegisterNetEvent('ps-adminmenu:server:Revive', function(data, selectedData)
     local data = CheckDataFromKey(data)
     if not data or not CheckPerms(source, data.perms) then return end
     local player = selectedData["Player"].value
-
-    TriggerClientEvent('hospital:client:Revive', player)
+    if GetResourceState('qbx_medical') == 'started' then
+        exports.qbx_medical:Revive(player)
+    else
+        TriggerClientEvent('hospital:client:Revive', player)
+    end
 end)
 
 -- Revive All
 RegisterNetEvent('ps-adminmenu:server:ReviveAll', function(data)
     local data = CheckDataFromKey(data)
     if not data or not CheckPerms(source, data.perms) then return end
 
-    TriggerClientEvent('hospital:client:Revive', -1)
+    if GetResourceState('qbx_medical') == 'started' then
+        exports.qbx_medical:Revive(-1)
+    else
+        TriggerClientEvent('hospital:client:Revive', -1)
+    end
 end)
 
 -- Revive Radius
@@ -105,7 +112,11 @@ RegisterNetEvent('ps-adminmenu:server:ReviveRadius', function(data)
         local dist = #(pos - targetPos)
 
         if dist < 15.0 then
-            TriggerClientEvent("hospital:client:Revive", v)
+            if GetResourceState('qbx_medical') == 'started' then
+                exports.qbx_medical:Revive(v)
+            else
+                TriggerClientEvent('hospital:client:Revive', v)
+            end
         end
     end
 end)

server/players.lua

@@ -31,6 +31,9 @@ local function getPlayers()
     for k, v in pairs(GetPlayers) do
         local playerData = v.PlayerData
         local vehicles = getVehicles(playerData.citizenid)
+        local coords = GetEntityCoords(GetPlayerPed(playerData.source))
+        local pos = { x = coords.x, y = coords.y, z = coords.z }
+
 
         players[#players + 1] = {
             id = k,
@@ -39,25 +42,49 @@ local function getPlayers()
             license = QBCore.Functions.GetIdentifier(k, 'license'),
             discord = QBCore.Functions.GetIdentifier(k, 'discord'),
             steam = QBCore.Functions.GetIdentifier(k, 'steam'),
+            fivem = QBCore.Functions.GetIdentifier(k, 'fivem'),
             job = playerData.job.label,
             grade = playerData.job.grade.level,
             dob = playerData.charinfo.birthdate,
             cash = playerData.money.cash,
             bank = playerData.money.bank,
             phone = playerData.charinfo.phone,
-            vehicles = vehicles
+            vehicles = vehicles,
+            pos = pos
         }
     end
 
+
     table.sort(players, function(a, b) return a.id < b.id end)
 
     return players
 end
 
+local function getPlayersPos()
+    local locations = {}
+    local GetPlayers = QBCore.Functions.GetQBPlayers()
+
+    for k, v in pairs(GetPlayers) do
+        local playerData = v.PlayerData
+        local coords = GetEntityCoords(GetPlayerPed(playerData.source))
+        local pos = { x = coords.x, y = coords.y, z = coords.z }
+        locations[#locations + 1] = {
+            id = k,
+            pos = pos
+        }
+    end
+
+    table.sort(locations, function(a, b) return a.id < b.id end)
+    return locations
+end
+
 lib.callback.register('ps-adminmenu:callback:GetPlayers', function(source)
     return getPlayers()
 end)
 
+lib.callback.register('ps-adminmenu:callback:GetPlayersPos', function(source)
+    return getPlayersPos()
+end)
 -- Set Job
 RegisterNetEvent('ps-adminmenu:server:SetJob', function(data, selectedData)
     local data = CheckDataFromKey(data)

server/spectate.lua

@@ -3,7 +3,7 @@ local spectating = {}
 RegisterNetEvent('ps-adminmenu:server:SpectateTarget', function(data, selectedData)
     local data = CheckDataFromKey(data)
     if not data or not CheckPerms(source, data.perms) then return end
-    local player = selectedData["Player"].value
+    local player = tonumber(selectedData["Player"].value)
 
     local type = "1"
     if player == source then return QBCore.Functions.Notify(source, locale("cant_spectate_yourself"), 'error', 7500) end

ui/src/layout/Main.svelte

@@ -8,6 +8,8 @@
 	import StaffChat from '@pages/Chat/Chat.svelte'
 	import Players from '@pages/Players/Players.svelte'
 	import Commands from '@pages/Commands/Commands.svelte'
+	import Livemap from '@pages/Livemap/Livemap.svelte'
+
 </script>
 
 <div
@@ -25,6 +27,8 @@
 			<Players />
 		{:else if $ACTIVE_PAGE == 'Commands'}
 			<Commands />
+		{:else if $ACTIVE_PAGE == 'Livemap'}
+			<Livemap />
 		{/if}
 	</div>
 </div>

ui/src/layout/Sidebar/Sidebar.svelte

@@ -9,6 +9,7 @@
 		{ value: 'Server', icon: 'fas fa-server' },
 		{ value: 'Commands', icon: 'fas fa-slash' },
 		{ value: 'Actions', icon: 'fas fa-wand-magic-sparkles' },
+		{ value: 'Livemap', icon: 'fas fa-map-location-dot' },
 	]
 </script>