Revert player iterator (TTT-2#1500)

partially reverts TTT-2#1453 Not sure if this is the best solution or if we should still keep some player.Iterator() calls. Feel free to discuss. See [this discussion on the GMod Discord](https://discord.com/channels/565105920414318602/567617926991970306/1224041147962228746) for more context on this issue. --------- Co-authored-by: saibotk <[email protected]>
Metastruct · Apr 12, 2024 · 297be1b · 297be1b
1 parent 48e66d3
commit 297be1b
Show file tree

Hide file tree

Showing 36 changed files with 99 additions and 97 deletions.
diff --git a/gamemodes/terrortown/entities/entities/ttt_base_placeable.lua b/gamemodes/terrortown/entities/entities/ttt_base_placeable.lua
@@ -179,7 +179,7 @@ if SERVER then
             end
 
             local pos = self:GetPos()
-            local ignore = select(2, player.Iterator())
+            local ignore = player.GetAll()
 
             ignore[#ignore + 1] = self
 

diff --git a/gamemodes/terrortown/entities/entities/ttt_c4/shared.lua b/gamemodes/terrortown/entities/entities/ttt_c4/shared.lua
@@ -8,7 +8,7 @@ local hook = hook
 local table = table
 local net = net
 local IsValid = IsValid
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 local defuserNearRadius = 90000
 
@@ -173,7 +173,7 @@ function ENT:SphereDamage(dmgowner, center, radius)
     local diff = nil
     local dmg = 0
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local ply = plys[i]
         if ply:Team() ~= TEAM_TERROR then
@@ -322,7 +322,7 @@ function ENT:IsDefuserInRange()
     local d = 0.0
     local diff = nil
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local ply = plys[i]
         if not ply:IsActive() or not ply:GetSubRoleData().isPolicingRole then

diff --git a/gamemodes/terrortown/entities/entities/ttt_traitor_check.lua b/gamemodes/terrortown/entities/entities/ttt_traitor_check.lua
@@ -32,7 +32,7 @@ function ENT:CountValidPlayers(activator, caller, data)
     local mins = self:LocalToWorld(self:OBBMins())
     local maxs = self:LocalToWorld(self:OBBMaxs())
 
-    local plys = select(2, player.Iterator())
+    local plys = player.GetAll()
     local count = 0
 
     for i = 1, #plys do

diff --git a/gamemodes/terrortown/entities/entities/ttt_weapon_check.lua b/gamemodes/terrortown/entities/entities/ttt_weapon_check.lua
@@ -109,7 +109,7 @@ function ENT:TestWeapons(weptype)
         return 0
     end
 
-    local plys = select(2, player.Iterator())
+    local plys = player.GetAll()
 
     for i = 1, #plys do
         local ply = plys[i]

diff --git a/gamemodes/terrortown/entities/weapons/weapon_ttt_teleport.lua b/gamemodes/terrortown/entities/weapons/weapon_ttt_teleport.lua
@@ -176,7 +176,7 @@ local function CanTeleportToPos(ply, pos)
         start = pos,
         endpos = pos,
         mask = MASK_PLAYERSOLID,
-        filter = select(2, player.Iterator()),
+        filter = player.GetAll(),
     }
     local collide = false
 

diff --git a/gamemodes/terrortown/entities/weapons/weapon_zm_carry.lua b/gamemodes/terrortown/entities/weapons/weapon_zm_carry.lua
@@ -273,7 +273,7 @@ function SWEP:CheckValidity()
 end
 
 local function PlayerStandsOn(ent)
-    local plys = select(2, player.Iterator())
+    local plys = player.GetAll()
 
     for i = 1, #plys do
         local ply = plys[i]

diff --git a/gamemodes/terrortown/gamemode/client/cl_main.lua b/gamemodes/terrortown/gamemode/client/cl_main.lua
@@ -9,7 +9,7 @@ local util = util
 local IsValid = IsValid
 local surface = surface
 local hook = hook
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 -- Define GM12 fonts for compatibility
 surface.CreateFont("DefaultBold", { font = "Tahoma", size = 13, weight = 1000 })
@@ -349,7 +349,7 @@ function GM:InitPostEntity()
     end
 
     -- cache players avatar
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local plyid64 = plys[i]:SteamID64()
 
@@ -487,7 +487,7 @@ local function RoundStateChange(o, n)
         CLSCORE:ClearPanel()
 
         -- people may have died and been searched during prep
-        local plys = select(2, playerIterator())
+        local plys = playerGetAll()
         for i = 1, #plys do
             bodysearch.ResetSearchResult(plys[i])
         end
@@ -528,7 +528,7 @@ local function RoundStateChange(o, n)
     -- whatever round state we get, clear out the voice flags
     local winTeams = roles.GetWinTeams()
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         for k = 1, #winTeams do
             plys[i][winTeams[k] .. "_gvoice"] = false
@@ -563,7 +563,7 @@ end
 net.Receive("TTT_Role", ReceiveRole)
 
 local function ReceiveRoleReset()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         plys[i]:SetRole(ROLE_NONE, TEAM_NONE)
     end
@@ -648,7 +648,7 @@ function GM:ClearClientState()
 
     VOICE.InitBattery()
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local pl = plys[i]
         if not IsValid(pl) then

diff --git a/gamemodes/terrortown/gamemode/client/cl_targetid.lua b/gamemodes/terrortown/gamemode/client/cl_targetid.lua
@@ -10,7 +10,7 @@ local math = math
 local IsValid = IsValid
 local hook = hook
 local targetid = targetid
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 ---
 -- Make sure local TargetID Variables are initialized
@@ -143,7 +143,7 @@ function GM:PostDrawTranslucentRenderables(bDrawingDepth, bDrawingSkybox)
     local client = LocalPlayer()
     local clientTarget = client:GetObserverTarget()
     local clientObsMode = client:GetObserverMode()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     if client:Team() == TEAM_SPEC and cvEnableSpectatorsoutline:GetBool() then
         cam.Start3D(EyePos(), EyeAngles())
@@ -224,7 +224,7 @@ local function DrawPropSpecLabels(client)
     end
 
     local tgt, scrpos, color, _
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]

diff --git a/gamemodes/terrortown/gamemode/client/cl_transfer.lua b/gamemodes/terrortown/gamemode/client/cl_transfer.lua
@@ -92,7 +92,7 @@ function CreateTransferMenu(parent)
     dpick:SetSortItems(false)
 
     -- fill combobox
-    local plys = select(2, player.Iterator())
+    local plys = player.GetAll()
 
     table.sort(plys, function(a, b)
         return a:IsInTeam(client) and not b:IsInTeam(client)

diff --git a/gamemodes/terrortown/gamemode/client/vgui/cl_sb_main.lua b/gamemodes/terrortown/gamemode/client/vgui/cl_sb_main.lua
@@ -18,7 +18,7 @@ local pairs = pairs
 local ipairs = ipairs
 local timer = timer
 local IsValid = IsValid
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 ttt_include("vgui__cl_sb_team")
 
@@ -530,7 +530,7 @@ function PANEL:UpdateScoreboard(force)
 
     -- Put players where they belong. Groups will dump them as soon as they don't
     -- anymore.
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local p = plys[i]
         if IsValid(p) then

diff --git a/gamemodes/terrortown/gamemode/server/sv_admin.lua b/gamemodes/terrortown/gamemode/server/sv_admin.lua
@@ -9,7 +9,7 @@ local pairs = pairs
 local ipairs = ipairs
 local util = util
 local IsValid = IsValid
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 local function GetPrintFn(ply)
     if IsValid(ply) then
@@ -55,7 +55,7 @@ function PrintTraitors(ply)
         ServerLog(Format("%s used ttt_print_traitors\n", IsValid(ply) and ply:Nick() or "console"))
 
         local pr = GetPrintFn(ply)
-        local ps = select(2, playerIterator())
+        local ps = playerGetAll()
 
         table.sort(ps, TraitorSort)
 
@@ -75,7 +75,7 @@ function PrintGroups(ply)
 
     pr("User", "-", "Group")
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
     for i = 1, #plys do
         local p = plys[i]
         pr(p:Nick(), "-", p:GetNWString("UserGroup"))

diff --git a/gamemodes/terrortown/gamemode/server/sv_armor.lua b/gamemodes/terrortown/gamemode/server/sv_armor.lua
@@ -96,7 +96,7 @@ end)
 -- @realm server
 -- @internal
 function ARMOR:InitPlayerArmor()
-    local plys = select(2, player.Iterator())
+    local plys = player.GetAll()
 
     for i = 1, #plys do
         local ply = plys[i]

diff --git a/gamemodes/terrortown/gamemode/server/sv_gamemsg.lua b/gamemodes/terrortown/gamemode/server/sv_gamemsg.lua
@@ -6,7 +6,7 @@ local net = net
 local string = string
 local table = table
 local IsValid = IsValid
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 ---
 -- Sends a GameMessage to every @{Player}
@@ -104,7 +104,7 @@ end
 -- @realm server
 -- @internal
 function ShowRoundStartPopup()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]
@@ -124,7 +124,7 @@ end
 -- @realm server
 function GetPlayerFilter(pred)
     local filter = {}
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]

diff --git a/gamemodes/terrortown/gamemode/server/sv_karma.lua b/gamemodes/terrortown/gamemode/server/sv_karma.lua
@@ -119,7 +119,7 @@ KARMA.reason = {
 
 local IsValid = IsValid
 local hook = hook
-local playerIterator = player.Iterator
+local playerGetAll = player.GetAll
 
 local function IsDebug()
     return config.debug:GetBool()
@@ -571,7 +571,7 @@ function KARMA.RoundIncrement()
     local healbonus = config.roundheal:GetFloat()
     local cleanbonus = config.clean:GetFloat()
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]
@@ -592,7 +592,7 @@ end
 -- When a new round starts, Live karma becomes Base karma
 -- @realm server
 function KARMA.Rebase()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]
@@ -609,7 +609,7 @@ end
 -- Apply karma to damage factor for all players
 -- @realm server
 function KARMA.ApplyKarmaAll()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         KARMA.ApplyKarma(plys[i])
@@ -674,7 +674,7 @@ function KARMA.RoundPrepare()
         return
     end
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]
@@ -693,7 +693,7 @@ function KARMA.CheckAutoKickAll()
         return
     end
 
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         KARMA.CheckAutoKick(plys[i])
@@ -777,7 +777,7 @@ end
 -- @realm server
 -- @see KARMA.Remember
 function KARMA.RememberAll()
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         KARMA.Remember(plys[i])
@@ -826,7 +826,7 @@ end
 -- @param function printfn
 -- @realm server
 function KARMA.PrintAll(printfn)
-    local plys = select(2, playerIterator())
+    local plys = playerGetAll()
 
     for i = 1, #plys do
         local ply = plys[i]