Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimized player.GetBySteamID/player.GetBySteamID64 #2094

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
+28 −17
Draft

Optimized player.GetBySteamID/player.GetBySteamID64 #2094

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a38ba70
faster player.GetBySteamID
afxnatic Jul 4, 2024
de1ca77
better bool comparison and hook name
afxnatic Jul 4, 2024
bc2ea4f
make boolean comparisons compliant
afxnatic Jul 4, 2024
0fe1582
reject bot steamid in player.GetBySteamID
afxnatic Jul 6, 2024
2967a91
Merge branch 'Facepunch:master' into faster-getbysteamid
afxnatic Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions garrysmod/lua/includes/extensions/player.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,28 +284,24 @@ function player.GetByUniqueID( ID )
return false
end

local sIDCache = {}

function player.GetBySteamID( ID )
ID = string.upper( ID )
local players = player.GetAll()
for i = 1, #players do
if ( players[i]:SteamID() == ID ) then
return players[i]
end

if ( ID == "BOT" ) then
return false
end

return false
local cID = util.SteamIDFrom64( ID )

return sIDCache[cID] or false
end

function player.GetBySteamID64( ID )
ID = tostring( ID )
local players = player.GetAll()
for i = 1, #players do
if ( players[i]:SteamID64() == ID ) then
return players[i]
end
end

return false
return sIDCache[ID] or false
end

local inext = ipairs( {} )
Expand All @@ -319,11 +315,26 @@ function player.Iterator()

end

local function InvalidatePlayerCache( ent )
local function InvalidatePlayer( ent, fullUpdate )

local isPlayer = ent:IsPlayer()

if ( isPlayer ) then PlayerCache = nil end

if ( ent:IsPlayer() ) then PlayerCache = nil end
if ( fullUpdate or not isPlayer ) then
return
end

local steamID = ent:SteamID64()

-- If fullUpdate isn't nil, this player was invalidated by EntityRemoved.
if ( fullUpdate == false ) then
sIDCache[steamID] = nil
else
sIDCache[steamID] = ent
end

end

hook.Add( "OnEntityCreated", "player.Iterator", InvalidatePlayerCache )
hook.Add( "EntityRemoved", "player.Iterator", InvalidatePlayerCache )
hook.Add( "OnEntityCreated", "player.Invalidation", InvalidatePlayer )
hook.Add( "EntityRemoved", "player.Invalidation", InvalidatePlayer )