@@ -29,6 +29,13 @@ local LOADING_SCREEN_TARGET_TIME = 7
29
29
local loading_screen_time
30
30
31
31
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
+
32
39
local entity_players = {}
33
40
local nametag_players = table .copy (ctf_teams .online_players [t ].players )
34
41
local symbol_players = {}
@@ -53,9 +60,9 @@ local function update_playertag(player, t, nametag, team_nametag, symbol_nametag
53
60
end
54
61
55
62
-- 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 )
59
66
end
60
67
61
68
local tags_hidden = false
@@ -101,11 +108,11 @@ local function set_playertags_state(state)
101
108
local nametag = playertag .entity
102
109
local symbol_entity = playertag .symbol_entity
103
110
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 ( {})
109
116
end
110
117
end
111
118
end
0 commit comments