edshot99/ulib
1
0
Fork 0
forked from TeamUlysses/ulib
Code Pull Requests Activity

feat: Add @<team> support to getUsers.

Browse Source
This commit is contained in:
Joshua Piper 2021-06-25 17:58:23 +01:00
parent 1d621219bd
commit 84840d3c55
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lua/ulib/shared/player.lua
View File

@ -202,11 +202,35 @@ function ULib.getUsers( target, enable_keywords, ply )
return false, "You cannot target yourself from console!"
end
end
elseif piece == "@" then
if IsValid( ply ) then
local player = ULib.getPicker( ply )
if player then
table.insert( tmpTargets, player )
elseif piece:sub( 1, 1 ) == "@" then
if #peice == 1 then
if IsValid( ply ) then
local player = ULib.getPicker( ply )
if player then
table.insert( tmpTargets, player )
end
end
else
local teamNameOrId = peice:sub( 2 )
local teamId = tonumber( teamNameOrId )
if teamId then
for _, ply in ipairs( team.GetPlayers( teamId ) ) do
table.insert( tmpTargets, ply )
end
else
local teams = team.GetAllTeams()
-- This can't be ipairs, as it's indexed by ID, starts at 0 and may not be sequential.
for teamId, teamData in pairs( teams ) do
if teamData.name == teamNameOrId then
for _, ply in ipairs( team.GetPlayers( teamId )) do
table.insert( tmpTargets, ply )
end
break
end
end
end
end
elseif piece:sub( 1, 1 ) == "#" and ULib.ucl.groups[ piece:sub( 2 ) ] then