Merge pull request #175 from Shark-vil/dev

v1.13.6

Author: Shark-vil

lua/background_npcs_core/classes/actor/sh_actor_base.lua

@@ -25,6 +25,7 @@ local table_RemoveByValue = table.RemoveByValue
 local table_Copy = table.Copy
 local table_Add = table.Add
 local table_insert = table.insert
+local table_isArray = table.isArray
 local string_find = string.find
 local string_lower = string.lower
 local hook_Run = hook.Run
@@ -1032,36 +1033,46 @@ function BaseClass:GetRelationship(value, default)
 end
 
 function BaseClass:HasTeam(value)
-	local value = value
-	if self.data.team ~= nil and value ~= nil then
-		if isstring(value) then
-			return table_HasValueBySeq(self.data.team, value)
+	if self.data == nil or self.data.team == nil or value == nil then
+		return false
+	end
+
+	if isstring(value) then
+		return table_HasValueBySeq(self.data.team, value)
+	end
+
+	if isentity(value) then
+		if isfunction(value.IsPlayer) and value:IsPlayer() then
+			if table_HasValueBySeq(self.data.team, 'player') then
+				return true
+			else
+				return bgNPC:GetModule('team_parent'):HasParent(value, self)
+			end
+		elseif value.isBgnActor and ((isfunction(value.IsNPC) and value:IsNPC()) or (isfunction(value.IsNextBot) and value:IsNextBot())) then
+			local actor = bgNPC:GetActor(value)
+			if actor then value = actor end
 		end
+	end
 
-		if isentity(value) then
-			if value:IsPlayer() then
-				if table_HasValueBySeq(self.data.team, 'player') then
-					return true
-				else
-					return bgNPC:GetModule('team_parent'):HasParent(value, self)
-				end
-			elseif value.isBgnActor and (value:IsNPC() or value:IsNextBot()) then
-				local actor = bgNPC:GetActor(value)
-				if not actor then return false end
-				value = actor:GetData().team
+	if istable(value) then
+		if value.isBgnClass and isfunction(value.GetData) then
+			local data = value:GetData()
+			if istable(data) and istable(data.team) then
+				value = data.team
 			end
 		end
 
-		if istable(value) then
-			if value.isBgnClass then value = value:GetData().team end
+		if not table_isArray(value) then
+			return false
+		end
 
-			for i = 1, #self.data.team do
-				for k = 1, #value do
-					if self.data.team[i] == value[k] then return true end
-				end
+		for i = 1, #self.data.team do
+			for k = 1, #value do
+				if self.data.team[i] == value[k] then return true end
 			end
 		end
 	end
+
 	return false
 end
 

lua/background_npcs_core/states/sv_walk.lua

@@ -63,6 +63,16 @@ local function UpdateActorMovementType(actor, data)
 end
 
 local function UpdateActorTargetPointAsync(actor, data)
+	-- if not data.Dick or data.Dick > CurTime() then
+	-- 	local actors = bgNPC:GetAllByRadius(actor:GetPos(), 300)
+	-- 	if #actors >= 3 then
+	-- 		data.updateTargetPointDelay = 0
+	-- 		print(1)
+	-- 		data.Dick = CurTime() + 10
+	-- 	else
+	-- 		data.Dick = CurTime() + 1
+	-- 	end
+	-- end
 	if not data.updateTargetPointDelay or data.updateTargetPointDelay > CurTime() then
 		return
 	end

lua/slib_autoloader/sh_background_npcs.lua

@@ -14,7 +14,7 @@ if SERVER then
 end
 
 bgNPC = {}
-bgNPC.VERSION = '1.13.5'
+bgNPC.VERSION = '1.13.6'
 
 -- Do not change -------------
 bgNPC.LANGUAGES = {}

version.txt

@@ -1 +1 @@
-1.13.5
+1.13.6