Skip to content

Fixing arrest;Renaming freezeprops file #100

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

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fixing arrest;Renaming freezeprops file #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
881f9f7
Fixing arrest;Renaming freezeprops file
overlordbleck Jul 14, 2022
152482d
Checking targetted players
overlordbleck Jul 14, 2022
1445ebd
Conventions
overlordbleck Jul 14, 2022
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
14 changes: 12 additions & 2 deletions lua/ulx/modules/sh/cfc_arrest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,24 @@ local cmd = CFCUlxCommands.arrest

CATEGORY_NAME = "Cleanup"

local function isTargetPlayer( ply, targetPlayers )
for _, p in pairs( targetPlayers ) do
if p == ply then
return true
end
end

return false
end

function cmd.arrest( callingPlayer, targetPlayers )
local entities = ents.GetAll()
local entCount = 0
local entCounts = {}

for _, ent in ipairs( entities ) do
local owner = ent.CPPIGetOwner and ent:CPPIGetOwner()
if owner and entCounts[owner] then
if owner and isTargetPlayer( owner ) then
Comment on lines +6 to +23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead we could make a lookup table first, which would only loop through the players once

function cmd.arrest( callingPlayer, targetPlayers )
    local entities = ents.GetAll()
    local entCount = 0
    local entCounts = {}

    local targetLookup= {}
    for _, ply in ipairs( targetPlayers ) do
        targetLookup[ply] = true
    end

    for _, ent in ipairs( entities ) do
        local owner = ent.CPPIGetOwner and ent:CPPIGetOwner() or ent:GetOwner()
        if owner and targetLookup[owner] then

if ent:GetClass() == "gmod_wire_expression2" then
ent:PCallHook( "destruct" )
ent:ResetContext()
Expand All @@ -19,7 +29,7 @@ function cmd.arrest( callingPlayer, targetPlayers )
end

if ent:GetClass() == "starfall_processor" then
ent:Error( SF.MakeError( ent.name .. ": Halted by ULX", 1, true, true) )
ent:Error( SF.MakeError( ent.name .. ": Halted by ULX", 1, true, true ) )
end

local canFreeze = not ( ent:IsWeapon() or ent:GetUnFreezable() or ent:IsPlayer() )
Expand Down
0 lua/ulx/modules/sh/cfc_freeze.lua → lua/ulx/modules/sh/cfc_freezeprops.lua
View file
Open in desktop
File renamed without changes.