Skip to content

Commit e713e16

Browse files
committed
update(utils): Safety Checks
1 parent 0da9a5c commit e713e16

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

plugin_files/bin/scripting/utils.lua

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,26 @@ function FindPlayersByTarget(target, matchbots)
3939

4040
--[[ team ]]
4141
if teamSelector[target] then
42-
local cbaseentity = fetchedPlayer:CBaseEntity()
42+
local cbaseentity = CBaseEntity(fetchedPlayer:CCSPlayerPawn():ToPtr())
4343
if cbaseentity then
44-
if cbaseentity.TeamNum == teamSelector[target] then
45-
table.insert(matchedPlayers, fetchedPlayer)
46-
goto findplayersbytargetcontinue
44+
if cbaseentity:IsValid() then
45+
if cbaseentity.TeamNum == teamSelector[target] then
46+
table.insert(matchedPlayers, fetchedPlayer)
47+
goto findplayersbytargetcontinue
48+
end
4749
end
4850
end
4951
end
5052

5153
--[[ life state ]]
5254
if lifeStateSelector[target] then
53-
local cbaseentity = fetchedPlayer:CBaseEntity()
55+
local cbaseentity = CBaseEntity(fetchedPlayer:CCSPlayerPawn():ToPtr())
5456
if cbaseentity then
55-
if cbaseentity.LifeState == lifeStateSelector[target] then
56-
table.insert(matchedPlayers, fetchedPlayer)
57-
goto findplayersbytargetcontinue
57+
if cbaseentity:IsValid() then
58+
if cbaseentity.LifeState == lifeStateSelector[target] then
59+
table.insert(matchedPlayers, fetchedPlayer)
60+
goto findplayersbytargetcontinue
61+
end
5862
end
5963
end
6064
end
@@ -67,9 +71,11 @@ function FindPlayersByTarget(target, matchbots)
6771

6872
local cbaseplayercontroller = fetchedPlayer:CBasePlayerController()
6973
if cbaseplayercontroller then
70-
if cbaseplayercontroller.PlayerName:find(target) then
71-
table.insert(matchedPlayers, fetchedPlayer)
72-
goto findplayersbytargetcontinue
74+
if cbaseplayercontroller:IsValid() then
75+
if cbaseplayercontroller.PlayerName:find(target) then
76+
table.insert(matchedPlayers, fetchedPlayer)
77+
goto findplayersbytargetcontinue
78+
end
7379
end
7480
end
7581

0 commit comments

Comments
 (0)