Skip to content

Commit 15106ac

Browse files
committed
Update v2.7.4
1 parent 014b6ed commit 15106ac

File tree

3 files changed

+59
-5
lines changed

3 files changed

+59
-5
lines changed

client/functions/player.lua

+38-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,21 @@ setmetatable(Player, {
5959
if tonumber(key) then
6060
return MSK.Trigger('msk_core:player', key)
6161
end
62+
end,
63+
__call = function(self, key, val, update)
64+
local value = rawget(self, key)
65+
66+
if value == nil then
67+
if type(val) == 'function' then
68+
value = func()
69+
else
70+
value = val
71+
end
72+
73+
rawset(self, key, value)
74+
end
75+
76+
return value
6277
end
6378
})
6479

@@ -89,4 +104,26 @@ CreateThread(function()
89104
end
90105
end)
91106

92-
MSK.Player = Player
107+
MSK.Player = Player
108+
109+
local Contains = function(key)
110+
local keys = {
111+
'clientId', 'serverId', 'playerId', 'Notify',
112+
'coords', 'heading', 'state',
113+
'ped', 'playerPed', 'vehicle', 'seat', 'weapon', 'isDead',
114+
}
115+
116+
for k, v in pairs(keys) do
117+
if k == key then
118+
return true
119+
end
120+
end
121+
122+
return false
123+
end
124+
125+
AddEventHandler('msk_core:invokingUpdate', function(key, value)
126+
if Contains(key) then return end
127+
128+
Player:set(key, value)
129+
end)

fxmanifest.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ games { 'gta5' }
44
author 'Musiker15 - MSK Scripts'
55
name 'msk_core'
66
description 'Functions for MSK Scripts'
7-
version '2.7.3'
7+
version '2.7.4'
88

99
lua54 'yes'
1010

import.lua

+20-3
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,32 @@ if context == 'client' then
9898
if tonumber(key) then
9999
return MSK.Trigger('msk_core:player', key)
100100
end
101+
end,
102+
__call = function(self, key, val, update)
103+
local value = rawget(self, key)
104+
105+
if value == nil then
106+
if type(val) == 'function' then
107+
value = func()
108+
else
109+
value = val
110+
end
111+
112+
rawset(self, key, value)
113+
114+
if update then
115+
TriggerEvent('msk_core:invokingUpdate', key, value)
116+
end
117+
end
118+
119+
return value
101120
end
102121
})
103122

104123
AddEventHandler('msk_core:onPlayer', function(key, value, oldValue)
105124
MSK.Player[key] = value
106125
end)
107-
end
108-
109-
if context == 'server' then
126+
elseif context == 'server' then
110127
local metatable = {
111128
__index = function(self, key)
112129
if type(key) == "string" then

0 commit comments

Comments
 (0)