From 39b857c1f3b29fe21548ca23b1c06b2fa6c8003b Mon Sep 17 00:00:00 2001 From: Linventif Date: Fri, 9 Aug 2024 17:53:58 +0000 Subject: [PATCH] refactor: in ipairs(player.GetAll()) --- lua/gmod_integration/client/cl_gui_admin.lua | 2 +- lua/gmod_integration/server/sv_players.lua | 2 +- lua/gmod_integration/server/sv_settings.lua | 2 +- lua/gmod_integration/server/sv_sync_bans.lua | 2 +- lua/gmod_integration/server/sv_sync_kicks.lua | 2 +- lua/gmod_integration/server/sv_sync_roles.lua | 2 +- lua/gmod_integration/shared/sh_api_format.lua | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/gmod_integration/client/cl_gui_admin.lua b/lua/gmod_integration/client/cl_gui_admin.lua index d7cdd81..a2143c1 100644 --- a/lua/gmod_integration/client/cl_gui_admin.lua +++ b/lua/gmod_integration/client/cl_gui_admin.lua @@ -215,7 +215,7 @@ function gmInte.openConfigMenu(data) configList:EnableVerticalScrollbar(false) collapsibleCategory:SetContents(configList) local categoryConfig = {} - for k, v in pairs(possibleConfig) do + for k, v in ipairs(possibleConfig) do if v.category == catName then table.insert(categoryConfig, v) end end diff --git a/lua/gmod_integration/server/sv_players.lua b/lua/gmod_integration/server/sv_players.lua index 6e7c85f..3c51d90 100644 --- a/lua/gmod_integration/server/sv_players.lua +++ b/lua/gmod_integration/server/sv_players.lua @@ -90,7 +90,7 @@ end hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) gmInte.playerReady(ply) end) hook.Add("ShutDown", "gmInte:Server:Shutdown:SavePlayers", function() - for _, ply in pairs(player.GetAll()) do + for _, ply in ipairs(player.GetAll()) do gmInte.playerDisconnected(ply) end end) diff --git a/lua/gmod_integration/server/sv_settings.lua b/lua/gmod_integration/server/sv_settings.lua index 6b79d62..365b36e 100644 --- a/lua/gmod_integration/server/sv_settings.lua +++ b/lua/gmod_integration/server/sv_settings.lua @@ -14,7 +14,7 @@ function gmInte.saveSetting(setting, value) gmInte.log("Setting Saved") if value == "websocketFQDN" || value == "id" || value == "token" then gmInte.resetWebSocket() end // send to all players the new public config - for _, ply in pairs(player.GetAll()) do + for _, ply in ipairs(player.GetAll()) do if ply:IsValid() && ply:IsPlayer(ply) then gmInte.log("Sending new Public Config to " .. ply:Nick(), true) gmInte.publicGetConfig(ply) diff --git a/lua/gmod_integration/server/sv_sync_bans.lua b/lua/gmod_integration/server/sv_sync_bans.lua index 9be3f2c..9836f9f 100644 --- a/lua/gmod_integration/server/sv_sync_bans.lua +++ b/lua/gmod_integration/server/sv_sync_bans.lua @@ -1,5 +1,5 @@ function gmInte.wsSyncBan(data) - for _, ply in pairs(player.GetAll()) do + for _, ply in ipairs(player.GetAll()) do if ply:SteamID64() == data.steam then ply:Kick(data.reason || "You have been banned from the server.") end end end diff --git a/lua/gmod_integration/server/sv_sync_kicks.lua b/lua/gmod_integration/server/sv_sync_kicks.lua index 5593daf..3b06202 100644 --- a/lua/gmod_integration/server/sv_sync_kicks.lua +++ b/lua/gmod_integration/server/sv_sync_kicks.lua @@ -1,5 +1,5 @@ function gmInte.wsSyncKick(data) - for _, ply in pairs(player.GetAll()) do + for _, ply in ipairs(player.GetAll()) do if ply:SteamID64() == data.steam then ply:Kick(data.reason || "You have been banned from the server.") end end end diff --git a/lua/gmod_integration/server/sv_sync_roles.lua b/lua/gmod_integration/server/sv_sync_roles.lua index a9f7ef0..2f5506c 100644 --- a/lua/gmod_integration/server/sv_sync_roles.lua +++ b/lua/gmod_integration/server/sv_sync_roles.lua @@ -72,7 +72,7 @@ end) // For those who refuse to use CAMI (bro, WTF), routine scan local lastScan = {} timer.Create("gmInte:SyncRoles:PlayerScan", 3, 0, function() - for k, v in pairs(player.GetAll()) do + for k, v in ipairs(player.GetAll()) do if lastScan[v:SteamID64()] == v:GetUserGroup() then continue end gmInte.playerChangeGroup(v:SteamID64(), lastScan[v:SteamID64()], v:GetUserGroup()) lastScan[v:SteamID64()] = v:GetUserGroup() diff --git a/lua/gmod_integration/shared/sh_api_format.lua b/lua/gmod_integration/shared/sh_api_format.lua index da378b1..41418b4 100644 --- a/lua/gmod_integration/shared/sh_api_format.lua +++ b/lua/gmod_integration/shared/sh_api_format.lua @@ -19,7 +19,7 @@ end function gmInte.getPlayersFormat() local players = {} - for k, v in pairs(player.GetAll()) do + for k, v in ipairs(player.GetAll()) do table.insert(players, gmInte.getPlayerFormat(v)) end return players