Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Made userpanel display if nightly is used #1388

Merged
merged 4 commits into from
Feb 5, 2024
Merged

Made userpanel display if nightly is used #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
538c827
Make server send if nightly is in use
ccuser44 Jan 28, 2024
c4be6eb
Made userpanel display if on nightly
ccuser44 Jan 28, 2024
c34b569
Nitpick
ccuser44 Jan 28, 2024
7dd339e
Remove unnecessary code
ccuser44 Jan 28, 2024
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
8 changes: 4 additions & 4 deletions MainModule/Client/UI/Default/UserPanel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ return function(data, env)
local gTable
local window = UI.Make("Window", {
Name = "UserPanel";
Title = "Adonis";
Icon = "rbxassetid://7681261289"; --"rbxassetid://7681088830"; --"rbxassetid://7681233602"; --"rbxassetid://7681048299";
Title = Variables.NightlyMode and "Adonis Nightly" or "Adonis";
Icon = Variables.NightlyMode and "rbxassetid://6877822142" or "rbxassetid://7681261289"; --"rbxassetid://7681088830"; --"rbxassetid://7681233602"; --"rbxassetid://7681048299";
Size = {465, 325};
AllowMultiple = false;
OnClose = function()
Expand Down Expand Up @@ -103,14 +103,14 @@ return function(data, env)
end

local function promptPurchase(isGamepass, id)
if client.Variables.AllowThirdPartyPurchases == false then
if Variables.AllowThirdPartyPurchases == false then
createPurchaseWindow(isGamepass, id)
else
local logEvent, finishEvent

logEvent = service.LogService.MessageOut:Connect(function(msg, typ)
if typ == Enum.MessageType.MessageWarning and string.find(msg, "AllowThirdPartySales has blocked the purchase prompt") then
client.Variables.AllowThirdPartyPurchases = false
Variables.AllowThirdPartyPurchases = false

createPurchaseWindow(isGamepass, id)
end
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Server/Core/Logs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ return function(Vargs, GetEnv)
Logs:AddLog("Script", "Logging Module Initialized");
end;

local UseDLL = not (server.Settings.UseLinkedListsInLogs == false or server.DisableLinkedListsInLogs)
local UseDLL = not (server.Settings.UseLinkedListsInLogs == false or server.Data.DisableLinkedListsInLogs)

server.Logs = {
Init = Init;
Expand Down
23 changes: 5 additions & 18 deletions MainModule/Server/Core/Process.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,8 +604,7 @@ return function(Vargs, GetEnv)
if utf8.len(utf8.nfcnormalize(msg)) > Process.MaxChatCharacterLimit and not Admin.CheckAdmin(p) then
Anti.Detected(p, "Kick", "Chatted message over the maximum character limit")
elseif not isMuted then
local Slowmode = Admin.CheckSlowMode(p)
if not Slowmode then
if not Admin.CheckSlowMode(p) then
local msg = string.sub(msg, 1, Process.MsgStringLimit)
local filtered = service.LaxFilter(msg, p)

Expand Down Expand Up @@ -634,7 +633,7 @@ return function(Vargs, GetEnv)
else
service.Events.PlayerChatted:Fire(p, msg)
end
elseif Slowmode then
else
local msg = string.sub(msg, 1, Process.MsgStringLimit)

if Settings.ChatCommands then
Expand Down Expand Up @@ -664,18 +663,6 @@ return function(Vargs, GetEnv)
end;

--[==[
WorkspaceChildAdded = function(c)
--[[if c:IsA("Model") then
local p = service.Players:GetPlayerFromCharacter(c)
if p then
service.TrackTask(`{p.Name}: CharacterAdded`, Process.CharacterAdded, p)
end
end

-- Moved to PlayerAdded handler
--]]
end;

LogService = function(Message, Type)
--service.Events.Output:Fire(Message, Type)
end;
Expand Down Expand Up @@ -922,6 +909,9 @@ return function(Vargs, GetEnv)
--// Start keybind listener
Remote.Send(p, "Function", "KeyBindListener", PlayerData.Keybinds or {})

-- // Send server variables to client
Remote.Send(p, "SetVariables", { TopBarShift = Settings.TopBarShift, NightlyMode = server.Data.NightlyMode or server.Data.ModuleID == 8612978896 })

--// Load some playerdata stuff
if type(PlayerData.Client) == "table" then
if PlayerData.Client.CapesEnabled == true or PlayerData.Client.CapesEnabled == nil then
Expand Down Expand Up @@ -1080,9 +1070,6 @@ return function(Vargs, GetEnv)
Message = Variables.NotifMessage
})
end
if Settings.TopBarShift then
Remote.Send(p, "SetVariables", { TopBarShift = true })
end

if
(not args[1] or
Expand Down
1 change: 0 additions & 1 deletion MainModule/Server/Server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,6 @@ return service.NewProxy({
server.LoadModule = LoadModule
server.LoadPackage = LoadPackage
server.ServiceSpecific = ServiceSpecific
server.DisableLinkedListsInLogs = data.DisableLinkedListsInLogs

server.Shared = Folder.Shared
server.ServerPlugins = data.ServerPlugins
Expand Down
Loading