Skip to content
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

Jump to bottom

Refactor permissions. Fixes: #1517 Fixes: #1516 #1518

Merged
merged 7 commits into from
Sep 15, 2023
Merged

Refactor permissions. Fixes: #1517 Fixes: #1516 #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c910517
Refactor permissions. Fixes: #1517 Fixes: #1516
thegrb93 Sep 14, 2023
3ea4078
Small fix
thegrb93 Sep 14, 2023
c58c4a5
Final tweaks
thegrb93 Sep 14, 2023
edd138f
Optimize permission check and clean up override code
thegrb93 Sep 14, 2023
dc72946
Small fix
thegrb93 Sep 14, 2023
b85ec2b
One more small optimization
thegrb93 Sep 14, 2023
968d6a8
Small bugfix
thegrb93 Sep 15, 2023
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
1 change: 1 addition & 0 deletions lua/starfall/instance.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function SF.Instance.Compile(code, mainfile, player, entity)
instance.source = code
instance.mainfile = mainfile
instance.requires = {}
instance.permissionOverrides = {}

instance.ppdata = {}
for filename, source in pairs(code) do
Expand Down
4 changes: 2 additions & 2 deletions lua/starfall/libs_sh/builtins.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ if CLIENT then
if not privileges[v] then
SF.Throw("Invalid permission name: "..v)
end
if not privileges[v][3].client then
SF.Throw("Permission isn't requestable: "..v)
if not privileges[v].overridable then
SF.Throw("Only client controlled permissions are requestable: "..v)
end
overrides[v] = true
end
Expand Down
Loading
Loading