Skip to content

Pass third "isPlay" argument in Expression2_CanEffect #3492

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
Jan 31, 2026
Merged

Pass third "isPlay" argument in Expression2_CanEffect #3492

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa8ffb
Pass third "isPlay" argument in Expression2_CanEffect
StrawWagen Jan 30, 2026
b9e6fdb
Lowercase is_play
Astralcircle Jan 31, 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
6 changes: 3 additions & 3 deletions lua/entities/gmod_wire_expression2/core/custom/effects.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ E2Lib.RegisterExtension("effects", false, "Allows E2s to play arbitrary effects.
local wire_expression2_effect_burst_max = CreateConVar("wire_expression2_effect_burst_max", 4, FCVAR_ARCHIVE)
local wire_expression2_effect_burst_rate = CreateConVar("wire_expression2_effect_burst_rate", 0.1, FCVAR_ARCHIVE)

-- Use hook Expression2_CanEffect to blacklist/whitelist effects
-- Use hook Expression2_CanEffect(name, e2, is_play) to blacklist/whitelist effects
local effect_blacklist = {
dof_node = true
}
Expand Down Expand Up @@ -169,7 +169,7 @@ e2function void effect:play(string name)

name = name:lower()
if effect_blacklist[name] then return self:throw("This effect is blacklisted!", nil) end
if hook.Run("Expression2_CanEffect", name, self) == false then return self:throw("A hook prevented this function from running", nil) end
if hook.Run("Expression2_CanEffect", name, self, true) == false then return self:throw("A hook prevented this function from running", nil) end

fire(self, this, name)
end
Expand All @@ -181,7 +181,7 @@ end
e2function number effectCanPlay(string name)
if not isAllowed(self) then return 0 end
if effect_blacklist[name] then return 0 end
if hook.Run("Expression2_CanEffect", name:lower(), self) == false then return 0 end
if hook.Run("Expression2_CanEffect", name:lower(), self, false) == false then return 0 end

return 1
end
Expand Down
Loading