Skip to content

Remove CanRunConsoleCommand global #3533

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

Merged
Astralcircle merged 2 commits into from
Feb 19, 2026
Merged

Remove CanRunConsoleCommand global #3533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b71039
Remove CanRunConsoleCommand global
Astralcircle Feb 19, 2026
335f416
More compression
Astralcircle Feb 19, 2026
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
16 changes: 2 additions & 14 deletions lua/entities/gmod_wire_expression2/core/cl_console.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@ local convars = {
wire_expression2_convar_whitelist = ""
}

local function CreateCVars()
for name,default in pairs(convars) do
local current_cvar = CreateClientConVar(name, default, true, true)
local value = current_cvar:GetString() or default
RunConsoleCommand(name, value)
end
end

if CanRunConsoleCommand() then
CreateCVars()
else
hook.Add("Initialize", "wire_expression2_console", function()
CreateCVars()
end)
for name, default in pairs(convars) do
CreateClientConVar(name, default, true, true)
end
27 changes: 9 additions & 18 deletions lua/entities/gmod_wire_expression2/core/cl_player.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
local function SendFriendStatus()
local friends = {}
hook.Add("OnEntityCreated", "wire_expression2_extension_player", function(ent)
if ent:IsPlayer() then
local friends = {}

for _, ply in ipairs(player.GetHumans()) do
if ply:GetFriendStatus() == "friend" then
table.insert(friends, ply:EntIndex())
for _, ply in ipairs(player.GetHumans()) do
if ply:GetFriendStatus() == "friend" then
table.insert(friends, ply:EntIndex())
end
end
end

RunConsoleCommand("wire_expression2_friend_status", table.concat(friends, ","))
end

if CanRunConsoleCommand() then
SendFriendStatus()
end

hook.Add("OnEntityCreated", "wire_expression2_extension_player", function(ent)
if not IsValid(ent) then return end
if not ent:IsPlayer() then return end

SendFriendStatus()
RunConsoleCommand("wire_expression2_friend_status", table.concat(friends, ","))
end
end)
7 changes: 0 additions & 7 deletions lua/wire/client/cl_wirelib.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,6 @@ hook.Add("InitPostEntity", "language_strings", function()
end
end)

if not CanRunConsoleCommand then
function CanRunConsoleCommand() return false end
hook.Add("Initialize", "CanRunConsoleCommand", function()
function CanRunConsoleCommand() return true end
end)
end

function Derma_StringRequestNoBlur(...)
local panel = Derma_StringRequest(...)
panel:SetBackgroundBlur(false)
Expand Down
8 changes: 3 additions & 5 deletions lua/wire/client/text_editor/wire_expression2_editor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,11 +1786,9 @@ function Editor:SetV(bool)
self:SetVisible(bool)
self:SetKeyboardInputEnabled(bool)
self:GetParent():SetWorldClicker(wire_expression2_editor_worldclicker:GetBool() and bool) -- Enable this on the background so we can update E2's without closing the editor
if CanRunConsoleCommand() then
RunConsoleCommand("wire_expression2_event", bool and "editor_open" or "editor_close")
if not e2_function_data_received and bool then -- Request the E2 functions
RunConsoleCommand("wire_expression2_sendfunctions")
end
RunConsoleCommand("wire_expression2_event", bool and "editor_open" or "editor_close")
if not e2_function_data_received and bool then -- Request the E2 functions
RunConsoleCommand("wire_expression2_sendfunctions")
end
end

Expand Down
Loading