fix(BSV2): remove net id sync calls

Author: xesdoog

SSV2/includes/features/YimActionsV3.lua

@@ -994,11 +994,10 @@ function YimActions.FXManager:StartPTFX(parent, ptfxData)
 		return
 	end
 
-	TaskWait(Game.RequestNamedPtfxAsset, ptfxData.dict)
-
-	local handle
-	if (Game.IsOnline() and parent ~= LocalPlayer:GetHandle()) then
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(parent))
+	local loaded, e = pcall(TaskWait, Game.RequestNamedPtfxAsset, ptfxData.dict)
+	if (not loaded) then
+		log.fwarning("[YimActions]: Failed to load partice effect: %s", e)
+		return
 	end
 
 	if (ptfxData.delay) then
@@ -1007,6 +1006,7 @@ function YimActions.FXManager:StartPTFX(parent, ptfxData)
 
 	GRAPHICS.USE_PARTICLE_FX_ASSET(ptfxData.dict)
 
+	local handle
 	if ENTITY.IS_ENTITY_A_PED(parent) then
 		handle = GRAPHICS.START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(
 			ptfxData.name,

SSV2/includes/frontend/settings/debug_ui.lua

@@ -192,7 +192,7 @@ local function DrawThreads()
 end
 
 local function DrawPointers()
-	local ptr_list, failed_ptr_list = PatternScanner:ListPointers()
+	local ptr_list, failed_ptr_list = PatternScanner:ListPatterns()
 	local total_count, failed_count = table.getlen(ptr_list), #failed_ptr_list
 	local child_height = math.min(total_count * 65, GVars.ui.window_size.y - 30)
 

SSV2/includes/modules/BSV2/Bodyguard.lua

@@ -120,14 +120,14 @@ function Bodyguard.new(modelHash, name, spawnPos, weapon, godmode, noRagdoll, be
 		Game.IsOnline(),
 		false
 	)
+
 	if (not ok or not Game.IsScriptHandle(handle)) then
 		Notifier:ShowWarning("Billionaire Services", "Failed to create entity! Please try again later", true, 5)
 		return
 	end
 
 	if (Game.IsOnline()) then
 		entities.take_control_of(handle, 500)
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(handle))
 	end
 
 	-- ENTITY.SET_ENTITY_LOD_DIST(handle, 0xFFFF) -- huh?

SSV2/includes/modules/BSV2/EscortVehicle.lua

@@ -36,8 +36,10 @@ function EscortVehicle.new(modelHash, groupName, godMode)
 	local blipName   = groupName or _F("Escort Vehicle (%s)", vehName)
 	local r, g, b, _ = COL_VANTABLACK:AsRGBA() -- Vantablack
 
-	entities.take_control_of(veh, 300)
-	Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(veh))
+	if (Game.IsOnline()) then
+		entities.take_control_of(veh, 300)
+	end
+
 	Game.SetBlipSprite(blip, 229)
 	Game.SetBlipName(blip, blipName)
 

SSV2/includes/modules/BSV2/PrivateHeli.lua

@@ -63,8 +63,6 @@ function PrivateHeli.spawn(model, spawnPos, godmode)
 	if (Game.IsOnline()) then
 		entities.take_control_of(pilot, 300)
 		entities.take_control_of(handle, 300)
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(pilot))
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(handle))
 	end
 
 	ENTITY.FREEZE_ENTITY_POSITION(pilot, false)

SSV2/includes/modules/BSV2/PrivateJet.lua

@@ -86,9 +86,6 @@ function PrivateJet.spawn(model, airportData)
 		entities.take_control_of(pilot, 300)
 		entities.take_control_of(copilot, 300)
 		entities.take_control_of(handle, 300)
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(pilot))
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(copilot))
-		Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(handle))
 	end
 
 	ENTITY.FREEZE_ENTITY_POSITION(pilot, false)

SSV2/includes/modules/BSV2/PrivateLimo.lua

@@ -183,10 +183,10 @@ function PrivateLimo:Spawn(t_Data, spawnPos)
 		return
 	end
 
-	entities.take_control_of(driver, 300)
-	entities.take_control_of(limo, 300)
-	Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(driver))
-	Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(limo))
+	if (Game.IsOnline()) then
+		entities.take_control_of(driver, 300)
+		entities.take_control_of(limo, 300)
+	end
 
 	ENTITY.FREEZE_ENTITY_POSITION(driver, false)
 	ENTITY.SET_ENTITY_INVINCIBLE(driver, true)

SSV2/includes/services/CompanionManager.lua

@@ -101,7 +101,6 @@ function CompanionManager:SpawnCompanion(pedModel, name, is_invincible, is_armed
 	)
 
 	entities.take_control_of(handle, 300)
-	Game.SyncNetworkID(NETWORK.NETWORK_GET_NETWORK_ID_FROM_ENTITY(handle))
 	GroupManager:AddPedToGroup(handle)
 	PED.SET_PED_AS_GROUP_MEMBER(handle, playerGroup)
 	PED.SET_PED_NEVER_LEAVES_GROUP(handle, true)

SSV2/includes/services/PatternScanner.lua

@@ -7,6 +7,7 @@
 --	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
 
 
+--#region Pattern
 --------------------------------------
 -- Class: Pattern
 --------------------------------------
@@ -23,7 +24,7 @@
 ---@field private m_address uint64_t
 ---@field protected m_ptr pointer
 ---@field private m_sig string
----@field private m_func fun(ptr: pointer): any
+---@field private m_callback fun(ptr: pointer): any
 ---@overload fun(name: string, ida_sig: string, func: fun(ptr: pointer): any): Pattern
 local Pattern = { __type = "Pattern" }
 Pattern.__index = Pattern
@@ -40,22 +41,22 @@ end
 
 ---@param name string
 ---@param ida_sig string
----@param func fun(ptr: pointer)
+---@param callback fun(ptr: pointer)
 ---@return Pattern
-function Pattern.new(name, ida_sig, func)
+function Pattern.new(name, ida_sig, callback)
 	return setmetatable({
-		m_name    = name,
-		m_sig     = ida_sig,
-		m_ptr     = nullptr,
-		m_address = 0x0,
-		m_func    = func
+		m_name     = name,
+		m_sig      = ida_sig,
+		m_ptr      = nullptr,
+		m_address  = 0x0,
+		m_callback = callback
 		---@diagnostic disable-next-line: param-type-mismatch
 	}, Pattern)
 end
 
--- Scans memory for this pointer's pattern and resolves its address.
+-- Scans memory for this pattern and resolves its address.
 --
--- Logs a debug message if successful.
+-- Logs a debug messages on successful or failure.
 ---@return boolean
 function Pattern:Scan()
 	self.m_ptr     = memory.scan_pattern(self.m_sig)
@@ -68,10 +69,10 @@ function Pattern:Scan()
 
 	log.fdebug("[PatternScanner]: Found %s at 0x%X", self.m_name, self.m_address)
 
-	if (type(self.m_func) == "function") then
-		local ok, result = pcall(self.m_func, self.m_ptr)
+	if (self.m_callback) then
+		local ok, e = pcall(self.m_callback, self.m_ptr)
 		if (not ok) then
-			log.fwarning("[PatternScanner]: Resolver failed for %s: %s", self.m_name, result)
+			log.fwarning("[PatternScanner]: Resolver failed for %s: %s", self.m_name, e)
 			return false
 		end
 	end
@@ -84,6 +85,10 @@ function Pattern:GetAddress()
 	return self.m_address
 end
 
+--#endregion
+
+--#region PatternScanner
+
 ---@enum eScannerState
 local eScannerState = {
 	NONE = 0x0,
@@ -96,50 +101,48 @@ local eScannerState = {
 --------------------------------------
 -- A singleton manager for storing and lazy scanning multiple memory patterns.
 ---@class PatternScanner : ClassMeta<PatternScanner>
----@field private m_patterns dict<Pattern>
----@field private m_failed_patterns array<Pattern>
----@field private m_state eScannerState
+---@field protected m_patterns dict<Pattern>
+---@field protected m_failed_patterns array<Pattern>
+---@field protected m_state eScannerState
 ---@field protected m_initialized boolean
 ---@overload fun(): PatternScanner
 local PatternScanner = Class("PatternScanner")
 
 ---@return PatternScanner
 function PatternScanner:init()
-	if (self.m_initialized) then
-		log.warning("Attempt to create a second instance of a singleton (PatternScanner)")
-		return self
-	end
+	if (self.m_initialized) then return self end
+	if (_G.PatternScanner) then return _G.PatternScanner end
 
-	self.m_patterns        = {}
-	self.m_failed_patterns = {}
-	self.m_state           = eScannerState.NONE
-	self.m_initialized     = true
-	return self
+	return setmetatable({
+		m_patterns        = {},
+		m_failed_patterns = {},
+		m_state           = eScannerState.NONE,
+		m_initialized     = true,
+		---@diagnostic disable-next-line
+	}, PatternScanner)
 end
 
 -- Registers a new pattern to be scanned later.
 --
 -- If a pattern with the same name already exists, the new name will be concatenated with four random characters.
 ---@param name string -- Unique name
 ---@param sig string -- IDA signature
----@param func fun(ptr: pointer) -- Resolver called with the found pointer.
-function PatternScanner:Add(name, sig, func)
+---@param callback fun(ptr: pointer) -- Resolver called with the found pointer.
+function PatternScanner:Add(name, sig, callback)
 	if (self.m_patterns[name]) then
 		name = name .. string.random(4)
 		log.fwarning("[PatternScanner]: A pattern with the same name already exists. Renamed current to '%s'", name)
 	end
 
-	self.m_patterns[name] = Pattern(name, sig, func)
+	self.m_patterns[name] = Pattern(name, sig, callback)
 end
 
 ---@return Pattern?
 function PatternScanner:Get(name)
 	return self.m_patterns[name]
 end
 
--- Scans all registered patterns asynchronously in a fiber.
---
--- Should be called on script init.
+-- Scans all registered patterns. Should be called on script init.
 function PatternScanner:Scan()
 	if (self:IsBusy()) then
 		log.debug("PatternScanner is busy at the moment. Try again later.")
@@ -159,7 +162,6 @@ function PatternScanner:Scan()
 		if (not ptr:Scan()) then
 			table.insert(self.m_failed_patterns, ptr)
 		end
-
 		-- yield()
 	end
 
@@ -184,12 +186,11 @@ function PatternScanner:RetryScan()
 
 	ThreadManager:Run(function()
 		local success = 0
-		self.m_state = eScannerState.BUSY
+		self.m_state  = eScannerState.BUSY
 
 		for i = sizeof_failed, 1, -1 do
-			local ptr = self.m_failed_patterns[i]
-
-			if (ptr:Scan()) then
+			local pattern = self.m_failed_patterns[i]
+			if (pattern:Scan()) then
 				table.remove(self.m_failed_patterns, i)
 				success = success + 1
 			end
@@ -217,9 +218,13 @@ function PatternScanner:IsBusy()
 	return self.m_state == eScannerState.BUSY
 end
 
----@return dict<Pattern>, array<Pattern>
-function PatternScanner:ListPointers()
+---@return dict<Pattern> patterns, array<Pattern> failed_patterns
+function PatternScanner:ListPatterns()
 	return self.m_patterns, self.m_failed_patterns
 end
 
-return PatternScanner()
+--#endregion
+
+local singleInstance = PatternScanner()
+_G.PatternScanner    = singleInstance
+return singleInstance