Skip to content

Commit 22eed67

Browse files
authored
Merge pull request #689 from Quenty/users/euvinkeel/cmdrstudio
allow cmdr admin for every client in multiplayer tests in studio
2 parents 6801a02 + 526684c commit 22eed67

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

src/permissionprovider/src/Client/Providers/PermissionProviderClient.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
local require = require(script.Parent.loader).load(script)
1010

1111
local Players = game:GetService("Players")
12+
local RunService = game:GetService("RunService")
1213

1314
local PermissionProviderConstants = require("PermissionProviderConstants")
1415
local Promise = require("Promise")
@@ -73,7 +74,12 @@ function PermissionProviderClient.PromiseIsAdmin(
7374
return reject("Got non-boolean from server")
7475
end
7576

76-
return resolve(result)
77+
-- Always allow in studio, for multi-client tests.
78+
if RunService:IsStudio() then
79+
return resolve(true)
80+
else
81+
return resolve(result)
82+
end
7783
end)
7884
end)
7985

src/permissionprovider/src/Server/PermissionService.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
--!strict
2+
local RunService = game:GetService("RunService")
23
--[=[
34
Provides permissions for the game. See [BasePermissionProvider].
45
@@ -135,6 +136,10 @@ function PermissionService.PromiseIsPermissionLevel(
135136
assert(typeof(player) == "Instance" and player:IsA("Player"), "bad player")
136137
assert(PermissionLevel:IsValue(permissionLevel), "Bad permissionLevel")
137138

139+
if RunService:IsStudio() then
140+
return Promise.resolved(true)
141+
end
142+
138143
return self:PromisePermissionProvider():Then(function(permissionProvider)
139144
return permissionProvider:PromiseIsPermissionLevel(player, permissionLevel)
140145
end)

src/throttle/src/Shared/ThrottledFunction.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
@interface ThrottleConfig
99
.leading boolean? -- If true, will dispatch immediately after creating this ThrottledFunction.
1010
.trailing boolean? -- If true, will dispatch after the timeout with the latest-called args.
11-
.leadingFirstTimeOnly boolean? -- If true, will dispatch immediately after creating this ThrottledFunction, but from then on, will begin the <timeout> window upon manual call
12-
and delay dispatch until <timeout> seconds have passed (with latest-called args).
11+
.leadingFirstTimeOnly boolean? -- If true, will dispatch immediately after creating this ThrottledFunction, but from then on, will begin the <timeout> window upon manual call and delay dispatch until <timeout> seconds have passed (with latest-called args).
1312
@within ThrottledFunction
1413
]=]
1514
export type ThrottleConfig = {

0 commit comments

Comments
 (0)