Update v0.2.2

- Added Wait modifier for markers (less lag when far)
- Fixed StateBag client-side at Player class
- Updated StateBag client-side

classes/client/marker.lua

@@ -62,15 +62,18 @@ MarkerMethods.__index = {
 	Inside = function(self, cb)
 		self.threadWorking = true
 		self.inside = false
+		self.threadWorkingTime = 0
 		Citizen.CreateThreadNow(function()
 			while self.threadWorking do
 				if Vdist2(self.coords.x, self.coords.y, self.coords.z, GetEntityCoords(PlayerPedId())) <= self.radius*1.5 then
 					if not self.inside then self.inside = true end
 					cb(self)
+					self.threadWorkingTime = 0
 				else
 					if self.inside then collectgarbage("collect") end
+					self.threadWorkingTime = 100
 				end
-				Wait(0)
+				Wait(self.threadWorkingTime)
 			end
 		end)
 	end,
@@ -82,7 +85,7 @@ MarkerMethods.__index = {
 				if Vdist2(self.coords.x, self.coords.y, self.coords.z, GetEntityCoords(PlayerPedId())) > self.radius*1.5 then
 					cb(self)
 				end
-				Wait(0)
+				Wait(self.threadWorkingTime)
 			end
 		end)
 	end

classes/client/player.lua

@@ -31,7 +31,10 @@ PlayerMethods.__call = function(self, source)
 	else
 		warning('The paremeter need to be number, but got '..type(source))
 	end
-	o.state = o.ped.state
+	if not StateBag then
+		import 'statebag'
+	end
+	o.state = StateBag(o.source, true)
 	return o
 end
 

classes/client/statebag.lua

@@ -6,15 +6,19 @@ exports('statebag', function()
 _G.StateBagMethods = {}
 
 
-StateBagMethods.__call = function(self, entityId)
+StateBagMethods.__call = function(self, entityId, isPlayer)
 	if type(entityId) == 'number' then
 		local o = setmetatable({}, {__index = self})
-		o.localId = entityId
-		o.networked = NetworkGetEntityIsNetworked(entityId)
-		if o.networked then
-			o.id = NetworkGetNetworkIdFromEntity(entityId)
-		else
+		if isPlayer ~= nil and isPlayer == true then
 			o.id = entityId
+		else
+			o.localId = entityId
+			o.networked = NetworkGetEntityIsNetworked(entityId)
+			if o.networked then
+				o.id = NetworkGetNetworkIdFromEntity(entityId)
+			else
+				o.id = entityId
+			end
 		end
 		return o
 	else

classes/fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version 'cerulean'
 games { 'gta5' }
 
 developer 'PiterMcFlebor'
-version '0.2.0'
+version '0.2.2'
 description [[
 
 Classes script created by PiterMcFlebor (2020)