@@ -201,13 +201,20 @@ function scoreboardGetColumnCount()
201201 return # scoreboardColumns
202202end
203203
204- function onClientDXScoreboardResourceStart ()
205- for key , column in ipairs ( scoreboardColumns ) do
206- triggerClientEvent ( client , " doScoreboardAddColumn" , root , column .name , column .width , column .friendlyName , column .priority , nil , column .isImage , column .imageW , column .imageH )
204+ function onPlayerResourceStartScoreboard (startedResource )
205+ local validResource = startedResource == resource
206+
207+ if not validResource then
208+ return false
209+ end
210+
211+ for columnID = 1 , # scoreboardColumns do
212+ local columnData = scoreboardColumns [columnID ]
213+
214+ triggerClientEvent (source , " doScoreboardAddColumn" , source , columnData .name , columnData .width , columnData .friendlyName , columnData .priority , nil , columnData .isImage , columnData .imageW , columnData .imageH )
207215 end
208216end
209- addEvent ( " onClientDXScoreboardResourceStart" , true )
210- addEventHandler ( " onClientDXScoreboardResourceStart" , resourceRoot , onClientDXScoreboardResourceStart )
217+ addEventHandler (" onPlayerResourceStart" , root , onPlayerResourceStartScoreboard )
211218
212219function requestServerInfo ()
213220 local mapmanager = getResourceFromName ( " mapmanager" )
@@ -230,10 +237,10 @@ function requestServerInfo()
230237 output .map = getResourceInfo ( map , " name" ) or getResourceName ( map )
231238 end
232239 end
233- triggerClientEvent ( client , " sendServerInfo" , root , output )
240+ triggerClientEvent ( client , " sendServerInfo" , client , output )
234241end
235242addEvent ( " requestServerInfo" , true )
236- addEventHandler ( " requestServerInfo" , resourceRoot , requestServerInfo )
243+ addEventHandler ( " requestServerInfo" , root , requestServerInfo )
237244
238245function removeResourceScoreboardColumns ( resource )
239246 if resourceColumns [resource ] then
0 commit comments