From 538c827a5098692fd6dc192be53f2f0fc21d587d Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:01:21 +0200 Subject: [PATCH 1/4] Make server send if nightly is in use --- MainModule/Server/Core/Process.lua | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/MainModule/Server/Core/Process.lua b/MainModule/Server/Core/Process.lua index 545d9b1012..095e955f2e 100644 --- a/MainModule/Server/Core/Process.lua +++ b/MainModule/Server/Core/Process.lua @@ -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) @@ -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 @@ -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; @@ -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 @@ -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 From c4be6ebce2a477fb6d12479b72b362584e17847b Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:12:31 +0200 Subject: [PATCH 2/4] Made userpanel display if on nightly --- MainModule/Client/UI/Default/UserPanel.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MainModule/Client/UI/Default/UserPanel.lua b/MainModule/Client/UI/Default/UserPanel.lua index e738b46c06..8562064286 100644 --- a/MainModule/Client/UI/Default/UserPanel.lua +++ b/MainModule/Client/UI/Default/UserPanel.lua @@ -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() @@ -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 From c34b569a7897431a003fe6a387146672b5cce370 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Sun, 28 Jan 2024 14:40:09 +0200 Subject: [PATCH 3/4] Nitpick --- MainModule/Server/Core/Logs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MainModule/Server/Core/Logs.lua b/MainModule/Server/Core/Logs.lua index 3941bf5d25..4bab844197 100644 --- a/MainModule/Server/Core/Logs.lua +++ b/MainModule/Server/Core/Logs.lua @@ -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; From 7dd339e13451071efd972cee9be9712442606951 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Sun, 28 Jan 2024 14:41:58 +0200 Subject: [PATCH 4/4] Remove unnecessary code --- MainModule/Server/Server.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/MainModule/Server/Server.lua b/MainModule/Server/Server.lua index 162e88545e..5fe10f6382 100644 --- a/MainModule/Server/Server.lua +++ b/MainModule/Server/Server.lua @@ -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