Update v2.5.1

Author: Musiker15

client/functions/player.lua

@@ -1,11 +1,5 @@
 local Player = {}
 
-Player.clientId = PlayerId()
-Player.serverId = GetPlayerServerId(Player.clientId)
-Player.playerId = Player.serverId
-
-MSK.Player = Player
-
 function Player:set(key, value)
     if self[key] ~= value then
         TriggerEvent('msk_core:onPlayer', key, value, self[key])
@@ -15,32 +9,66 @@ function Player:set(key, value)
     end
 end
 
+function Player:remove(key)
+    if self[key] then
+        TriggerEvent('msk_core:onPlayerRemove', key, self[key])
+        self[key] = nil
+
+        return true
+    end
+end
+
+Player:set('clientId', PlayerId())
+Player:set('serverId', GetPlayerServerId(Player.clientId))
+Player:set('playerId', Player.serverId)
+Player:set('source', Player.serverId)
+
+local Notify = function(title, message, typ, duration)
+    MSK.Notification(title, message, typ, duration)
+end
+Player:set('Notify', Notify)
+
+local GetPlayerDeath = function()
+    local isDead = IsPlayerDead(Player.clientId) or IsEntityDead(Player.playerPed) or IsPedFatallyInjured(Player.playerPed)
+
+    if GetResourceState("visn_are") == "started" then
+        local healthBuffer = exports.visn_are:GetHealthBuffer()
+        isDead = healthBuffer.unconscious
+    end
+
+    if GetResourceState("osp_ambulance") == "started" then
+        local data = exports.osp_ambulance:GetAmbulanceData(Player.serverId)
+        isDead = data.isDead or data.inLastStand
+    end
+
+    return isDead
+end
+
 CreateThread(function()
 	while true do
-        Player:set('clientId', PlayerId())
-        Player:set('serverId', GetPlayerServerId(Player.clientId))
-        Player:set('playerId', Player.serverId)
-
-        local playerPed = PlayerPedId()
-        Player:set('playerPed', playerPed)
+        Player:set('ped', PlayerPedId())
+        Player:set('playerPed', Player.ped)
 
-        local vehicle = GetVehiclePedIsIn(playerPed, false)
+        local vehicle = GetVehiclePedIsIn(Player.ped, false)
 
         if vehicle > 0 and DoesEntityExist(vehicle) then
             Player:set('vehicle', vehicle)
 
-            if not Player.seat or GetPedInVehicleSeat(vehicle, Player.seat) ~= playerPed then
-                Player:set('seat', MSK.GetPedVehicleSeat(playerPed, vehicle))
-                TriggerEvent('msk_core:onSeatChange', Player.vehicle, Player.seat)
+            if not Player.seat or GetPedInVehicleSeat(vehicle, Player.seat) ~= Player.ped then
+                Player:set('seat', MSK.GetPedVehicleSeat(Player.ped, vehicle))
             end
         else
             Player:set('vehicle', false)
             Player:set('seat', false)
         end
 
-        local hasWeapon, currentWeapon = GetCurrentPedWeapon(playerPed, true)
+        local hasWeapon, currentWeapon = GetCurrentPedWeapon(Player.ped, true)
         Player:set('weapon', hasWeapon and currentWeapon or false)
 
+        Player:set('isDead', GetPlayerDeath())
+
         Wait(100)
     end
-end)
+end)
+
+MSK.Player = Player

client/main.lua

@@ -11,15 +11,18 @@ MSK.Bridge.Framework.Events = {
 
 if Config.Framework == 'AUTO' then
     if GetResourceState('es_extended') ~= 'missing' then
-        ESX = exports["es_extended"]:getSharedObject()
-        MSK.Bridge.Framework.Type = 'ESX'
-        MSK.Bridge.Framework.Core = ESX
+        Config.Framework = 'ESX'
     elseif GetResourceState('qb-core') ~= 'missing' then
-        QBCore = exports['qb-core']:GetCoreObject()
-        MSK.Bridge.Framework.Type = 'QBCore'
-        MSK.Bridge.Framework.Core = QBCore
+        Config.Framework = 'QBCore'
+    else
+        Config.Framework = 'STANDALONE'
+        MSK.Bridge.Framework.Type = 'STANDALONE'
     end
-elseif Config.Framework == 'ESX' then
+
+    print(('[^2%s^0] [^4Info^0] Framework ^3%s^0 found'):format(GetCurrentResourceName(), Config.Framework))
+end
+
+if Config.Framework == 'ESX' then
     ESX = exports["es_extended"]:getSharedObject()
     MSK.Bridge.Framework.Type = 'ESX'
     MSK.Bridge.Framework.Core = ESX

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Functions for MSK Scripts'
-version '2.5.0'
+version '2.5.1'
 
 lua54 'yes'
 
@@ -37,5 +37,7 @@ files {
 }
 
 dependencies {
+    '/server:7290',
+    '/onesync',
     'oxmysql'
 }

import.lua

@@ -18,6 +18,8 @@ if GetResourceState(msk_core) ~= 'started' then
     error('^1msk_core must be started before this resource.^0', 0)
 end
 
+local context = IsDuplicityVersion() and 'server' or 'client'
+
 ----------------------------------------------------------------
 -- Export for MSK Library
 ----------------------------------------------------------------
@@ -50,35 +52,28 @@ setmetatable(MSK.Progress, {
 ----------------------------------------------------------------
 -- MSK.Player
 ----------------------------------------------------------------
-if not IsDuplicityVersion() then
-    MSK.Player = {}
-
-    MSK.Player.clientId = PlayerId()
-    MSK.Player.serverId = GetPlayerServerId(MSK.Player.clientId)
-    MSK.Player.playerId = MSK.Player.serverId
-
-    CreateThread(function()
-        local playerPed = PlayerPedId()
-        MSK.Player.playerPed = playerPed
-
-        local vehicle = GetVehiclePedIsIn(playerPed, false)
-
-        if vehicle > 0 and DoesEntityExist(vehicle) then
-            MSK.Player.vehicle = vehicle
-
-            if not MSK.Player.seat or GetPedInVehicleSeat(vehicle, MSK.Player.seat) ~= playerPed then
-                MSK.Player.seat = MSK.GetPedVehicleSeat(playerPed, vehicle)
-            end
-        else
-            MSK.Player.vehicle = false
-            MSK.Player.seat = false
-        end
-
-        local hasWeapon, currentWeapon = GetCurrentPedWeapon(playerPed, true)
-        MSK.Player.weapon = hasWeapon and currentWeapon or false
-    end)
+if context == 'client' then
+    local Player = {
+        clientId = MSK.Player.clientId,
+        serverId = MSK.Player.serverId,
+        playerId = MSK.Player.playerId,
+        source = MSK.Player.source,
+        ped = MSK.Player.ped,
+        playerPed = MSK.Player.ped,
+        vehicle = MSK.Player.vehicle,
+        seat = MSK.Player.seat,
+        weapon = MSK.Player.weapon,
+        isDead = MSK.Player.isDead,
+        Notify = MSK.Player.Notify,
+    }
+
+    MSK.Player = Player
 
     AddEventHandler('msk_core:onPlayer', function(key, value, oldValue)
         MSK.Player[key] = value
     end)
+
+    AddEventHandler('msk_core:onPlayerRemove', function(key, value)
+        MSK.Player[key] = nil
+    end)
 end

server/main.lua

@@ -10,16 +10,18 @@ MSK.Bridge.Framework.Events = {
 
 if Config.Framework == 'AUTO' then
     if GetResourceState('es_extended') ~= 'missing' then
-        ESX = exports["es_extended"]:getSharedObject()
-        MSK.Bridge.Framework.Type = 'ESX'
-        MSK.Bridge.Framework.Core = ESX
+        Config.Framework = 'ESX'
     elseif GetResourceState('qb-core') ~= 'missing' then
-        QBCore = exports['qb-core']:GetCoreObject()
-        MSK.Bridge.Framework.Type = 'QBCore'
-        MSK.Bridge.Framework.Core = QBCore
+        Config.Framework = 'QBCore'
+    else
+        Config.Framework = 'STANDALONE'
+        MSK.Bridge.Framework.Type = 'STANDALONE'
     end
-    print(('[^2%s^0] [^4Info^0] Framework ^3%s^0 found'):format(GetCurrentResourceName(), MSK.Bridge.Framework.Type))
-elseif Config.Framework == 'ESX' then
+
+    print(('[^2%s^0] [^4Info^0] Framework ^3%s^0 found'):format(GetCurrentResourceName(), Config.Framework))
+end
+
+if Config.Framework == 'ESX' then
     ESX = exports["es_extended"]:getSharedObject()
     MSK.Bridge.Framework.Type = 'ESX'
     MSK.Bridge.Framework.Core = ESX