Update v2.6.4

Author: Musiker15

client/functions/main.lua

@@ -150,13 +150,13 @@ end
 exports('DrawGenericText', MSK.DrawGenericText)
 RegisterNetEvent("msk_core:drawGenericText", MSK.DrawGenericText)
 
-MSK.HasItem = function(item)
-    if MSK.Bridge.Framework.Type ~= 'ESX' and MSK.Bridge.Framework.Type ~= 'QBCore' then 
-        logging('error', ('Function %s can not used without Framework!'):format('MSK.HasItem'))
+MSK.HasItem = function(itemName, metadata)
+    if MSK.Bridge.Framework.Type == 'STANDALONE' then 
+        MSK.Logging('error', 'Function "MSK.HasItem" cannot be used without Framework!')
         return
     end
 
-    return MSK.Trigger('msk_core:hasItem', item)
+    return MSK.Trigger('msk_core:hasItem', itemName, metadata)
 end
 exports('HasItem', MSK.HasItem)
 

client/functions/player.lua

@@ -1,9 +1,10 @@
+local PlayerState = Player
 local Player = {}
 
 function Player:set(key, value)
     if self[key] ~= value then
         TriggerEvent('msk_core:onPlayer', key, value, self[key])
-        TriggerServerEvent('msk_core:onPlayer', key, key == 'vehicle' and DoesEntityExist(value) and NetworkGetNetworkIdFromEntity(value) or value, key == 'vehicle' and DoesEntityExist(self[key]) and NetworkGetNetworkIdFromEntity(self[key]) or self[key])
+        TriggerServerEvent('msk_core:onPlayer', key, key == 'vehicle' and NetworkGetNetworkIdFromEntity(value) or value, self[key])
         self[key] = value
 
         return true
@@ -13,7 +14,7 @@ end
 function Player:remove(key)
     if self[key] then
         TriggerEvent('msk_core:onPlayerRemove', key, self[key])
-        TriggerServerEvent('msk_core:onPlayerRemove', key, key == 'vehicle' and DoesEntityExist(self[key]) and NetworkGetNetworkIdFromEntity(self[key]) or self[key])
+        TriggerServerEvent('msk_core:onPlayerRemove', key, self[key])
         self[key] = nil
 
         return true
@@ -23,15 +24,14 @@ 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)
+    local isDead = IsPlayerDead(Player.clientId) or IsEntityDead(Player.ped) or IsPedFatallyInjured(Player.ped)
 
     if GetResourceState("visn_are") == "started" then
         local healthBuffer = exports.visn_are:GetHealthBuffer()
@@ -50,7 +50,10 @@ CreateThread(function()
 	while true do
         Player:set('ped', PlayerPedId())
         Player:set('playerPed', Player.ped)
-
+        Player:set('coords', GetEntityCoords(Player.ped))
+        Player:set('heading', GetEntityHeading(Player.ped))
+        Player:set('state', PlayerState(Player.serverId).state)
+        
         local vehicle = GetVehiclePedIsIn(Player.ped, false)
 
         if vehicle > 0 and DoesEntityExist(vehicle) then

fxmanifest.lua

@@ -4,7 +4,7 @@ games { 'gta5' }
 author 'Musiker15 - MSK Scripts'
 name 'msk_core'
 description 'Functions for MSK Scripts'
-version '2.6.3'
+version '2.6.4'
 
 lua54 'yes'
 

import.lua

@@ -57,9 +57,11 @@ if context == 'client' then
         clientId = MSK.Player.clientId,
         serverId = MSK.Player.serverId,
         playerId = MSK.Player.playerId,
-        source = MSK.Player.source,
+        state = Player(MSK.Player.serverId).state,
         ped = MSK.Player.ped,
         playerPed = MSK.Player.ped,
+        coords = MSK.Player.coords,
+        heading = MSK.Player.heading,
         vehicle = MSK.Player.vehicle,
         seat = MSK.Player.seat,
         weapon = MSK.Player.weapon,

server/functions/callbacks.lua

@@ -81,9 +81,17 @@ end)
 ----------------------------------------------------------------
 -- Server Callbacks with Method [return]
 ----------------------------------------------------------------
-MSK.Register('msk_core:hasItem', MSK.HasItem)
-MSK.Register('msk_core:isAceAllowed', MSK.IsAceAllowed)
-MSK.Register('msk_core:isPrincipalAceAllowed', MSK.IsPrincipalAceAllowed)
+MSK.Register('msk_core:hasItem', function(source, itemName, metadata)
+    return MSK.HasItem(source, itemName, metadata)
+end)
+
+MSK.Register('msk_core:isAceAllowed', function(source, command)
+    return MSK.IsAceAllowed(source, command)
+end)
+
+MSK.Register('msk_core:isPrincipalAceAllowed', function(source, principal, ace)
+    return MSK.IsPrincipalAceAllowed(principal, ace)
+end)
 
 -- For clientside MSK.RegisterCommand
 MSK.Register('msk_core:doesPlayerExist', function(source, targetId)

server/functions/main.lua

@@ -123,19 +123,19 @@ MSK.AddWebhook = function(webhook, botColor, botName, botAvatar, title, descript
 end
 exports('AddWebhook', MSK.AddWebhook)
 
-MSK.HasItem = function(playerId, item)
+MSK.HasItem = function(playerId, itemName, metadata)
     if not playerId then 
         MSK.Logging('error', 'Player on Function MSK.HasItem does not exist!') 
-        return
+        return false
     end
 
-    if MSK.Bridge.Framework.Type ~= 'ESX' and MSK.Bridge.Framework.Type ~= 'QBCore' then 
-        MSK.Logging('error', ('Function %s can not used without Framework!'):format('^3MSK.HasItem^0'))
-        return
+    if MSK.Bridge.Framework.Type == 'STANDALONE' then 
+        MSK.Logging('error', 'Function "MSK.HasItem" cannot be used without Framework!')
+        return false
     end
 
-    local Player = MSK.GetPlayerFromId(playerId)
+    local Player = MSK.GetPlayer({source = playerId})
 
-    return Player.HasItem(item)
+    return Player.HasItem(itemName, metadata)
 end
 exports('HasItem', MSK.HasItem)

server/functions/player.lua

@@ -7,7 +7,7 @@ local onPlayer = function(key, value, oldValue)
         Player[playerId] = {}
     end
 
-    if Player[playerId] and Player[playerId][key] ~= value then
+    if Player[playerId][key] ~= value then
         Player[playerId][key] = value
 
         if key == 'vehicle' then
@@ -27,11 +27,16 @@ local onPlayerRemove = function(key, value)
         Player[playerId] = {}
     end
 
-    if Player[playerId] and Player[playerId][key] then
+    if Player[playerId][key] then
         Player[playerId][key] = nil
+
+        if key == 'vehicle' then
+            Player[playerId]['vehNetId'] = nil
+        end
+
         TriggerEvent('msk_core:OnPlayerRemove', playerId, key, value)
     end
 end
-AddEventHandler('msk_core:onPlayerRemove', onPlayerRemove)
+RegisterNetEvent('msk_core:onPlayerRemove', onPlayerRemove)
 
 MSK.Player = Player