Skip to content

Disallow damaging players via E2 until you cantool them or you are admin #3731

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
Sep 30, 2026
Merged

Disallow damaging players via E2 until you cantool them or you are admin #3731

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
624c398
Disallow damaging players via E2 until you cantool them or you are admin
Astralcircle Sep 30, 2026
7716a15
Fix issue that i noticied
Astralcircle Sep 30, 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
5 changes: 4 additions & 1 deletion lua/entities/gmod_wire_expression2/core/damage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ e2function void entity:takeDamage(number amount)
if not Enabled:GetBool() then return self:throw("Dealing damage is disabled via wire_expression2_damage_enabled") end
if not IsValid(this) then return self:throw("Invalid entity!", nil) end
if not WireLib.CanDamage(self.player, this) then return self:throw("You cannot damage this entity!", nil) end
if this:IsPlayer() and not E2Lib.isFriend(self.player, this) and not WireLib.CanTool(self.player, this, "wire_expression2") then return self:throw("You cannot damage this player!", nil) end

this:TakeDamage(amount, self.player, self.entity)
end
Expand All @@ -119,6 +120,7 @@ e2function void entity:takeDamage(number amount, entity attacker)
if not IsValid(attacker) then return self:throw("Invalid attacker entity!", nil) end
if not E2Lib.isOwner(self, attacker) then return self:throw("You do not own the attacker entity!", nil) end
if not WireLib.CanDamage(self.player, this) then return self:throw("You cannot damage this entity!", nil) end
if this:IsPlayer() and not E2Lib.isFriend(self.player, this) and not WireLib.CanTool(self.player, this, "wire_expression2") then return self:throw("You cannot damage this player!", nil) end

this:TakeDamage(amount, attacker, self.entity)
end
Expand All @@ -130,7 +132,8 @@ e2function void entity:takeDamage(number amount, entity attacker, entity inflict
if not E2Lib.isOwner(self, attacker) then return self:throw("You do not own the attacker entity!", nil) end
if not IsValid(inflictor) then return self:throw("Invalid inflictor entity!", nil) end
if not E2Lib.isOwner(self, inflictor) then return self:throw("You do not own the inflictor entity!", nil) end
if not WireLib.CanDamage(self.player, this) then self:throw("You cannot damage this entity!", nil) end
if not WireLib.CanDamage(self.player, this) then return self:throw("You cannot damage this entity!", nil) end
if this:IsPlayer() and not E2Lib.isFriend(self.player, this) and not WireLib.CanTool(self.player, this, "wire_expression2") then return self:throw("You cannot damage this player!", nil) end

this:TakeDamage(amount, attacker, inflictor)
end
Expand Down
Loading