Skip to content

Commit c315c73

Browse files
committed
Stop using pcall() for set_observers()
1 parent e2d5deb commit c315c73

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

mods/ctf/ctf_modebase/features.lua

+15-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ local LOADING_SCREEN_TARGET_TIME = 7
2929
local loading_screen_time
3030

3131
local function update_playertag(player, t, nametag, team_nametag, symbol_nametag)
32+
if not nametag.object.set_observers or
33+
not team_nametag.object.set_observers or
34+
not symbol_nametag.object.set_observers
35+
then
36+
return
37+
end
38+
3239
local entity_players = {}
3340
local nametag_players = table.copy(ctf_teams.online_players[t].players)
3441
local symbol_players = {}
@@ -53,9 +60,9 @@ local function update_playertag(player, t, nametag, team_nametag, symbol_nametag
5360
end
5461

5562
-- Occasionally crashes in singleplayer, so call it safely
56-
pcall( team_nametag.object.set_observers, team_nametag.object, nametag_players)
57-
pcall(symbol_nametag.object.set_observers, symbol_nametag.object, symbol_players )
58-
pcall( nametag.object.set_observers, nametag.object, entity_players )
63+
nametag.object:set_observers(entity_players )
64+
team_nametag.object:set_observers(nametag_players)
65+
symbol_nametag.object:set_observers(symbol_players )
5966
end
6067

6168
local tags_hidden = false
@@ -101,11 +108,11 @@ local function set_playertags_state(state)
101108
local nametag = playertag.entity
102109
local symbol_entity = playertag.symbol_entity
103110

104-
if nametag and team_nametag and symbol_entity then
105-
-- Occasionally crashes in singleplayer, so call it safely
106-
pcall( team_nametag.object.set_observers, team_nametag.object, {})
107-
pcall(symbol_entity.object.set_observers, symbol_entity.object, {})
108-
pcall( nametag.object.set_observers, nametag.object, {})
111+
if nametag and team_nametag and symbol_entity and
112+
nametag.object.set_observers and team_nametag.object.set_observers and symbol_entity.object.set_observers then
113+
team_nametag.object:set_observers({})
114+
symbol_entity.object:set_observers({})
115+
nametag.object:set_observers({})
109116
end
110117
end
111118
end

0 commit comments

Comments
 (0)