From d27129da267bb0345503eafcb78d6ee322f941ac Mon Sep 17 00:00:00 2001 From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:22:29 +0000 Subject: [PATCH 1/4] Fix incorrect element name in rocket info --- exp_legacy/module/modules/gui/autofill.lua | 2 +- exp_legacy/module/modules/gui/rocket-info.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exp_legacy/module/modules/gui/autofill.lua b/exp_legacy/module/modules/gui/autofill.lua index f0905230..afcbfe89 100644 --- a/exp_legacy/module/modules/gui/autofill.lua +++ b/exp_legacy/module/modules/gui/autofill.lua @@ -115,7 +115,7 @@ local section = Gui.element("autofill_section") return def:unlink_element(section_table) end) :on_click(function(def, player, element, event) - event.element = element.parent.alignment[toggle_section.name] + event.element = element.parent.flow[toggle_section.name] toggle_section:raise_event(event) end) diff --git a/exp_legacy/module/modules/gui/rocket-info.lua b/exp_legacy/module/modules/gui/rocket-info.lua index 4f4dbb66..e47551cc 100644 --- a/exp_legacy/module/modules/gui/rocket-info.lua +++ b/exp_legacy/module/modules/gui/rocket-info.lua @@ -443,7 +443,7 @@ local section = Gui.element("rocket_info_section") return definition:unlink_element(scroll_table) end) :on_click(function(def, player, element, event) - event.element = element.parent.alignment[toggle_section.name] + event.element = element.parent.flow[toggle_section.name] toggle_section:raise_event(event) end) From 55c39bd5134bc0015cba85c8f8cd1e04001c5269 Mon Sep 17 00:00:00 2001 From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:25:37 +0000 Subject: [PATCH 2/4] Fix missing default in server ups --- exp_legacy/module/modules/gui/server-ups.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exp_legacy/module/modules/gui/server-ups.lua b/exp_legacy/module/modules/gui/server-ups.lua index c05ca770..cb1f73bf 100644 --- a/exp_legacy/module/modules/gui/server-ups.lua +++ b/exp_legacy/module/modules/gui/server-ups.lua @@ -36,7 +36,7 @@ UsesServerUps:on_load(function(player_name, visible) local label = player.gui.screen[server_ups.name] --- @diagnostic disable-next-line undefined-field if not External.valid() or not storage.ext.var.server_ups then visible = false end - label.visible = visible + label.visible = visible or false end) --- Toggles if the server ups is visbile From 7504043b05038d3792ef514cc1714c3611234177 Mon Sep 17 00:00:00 2001 From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:30:31 +0000 Subject: [PATCH 3/4] Remove admin_only from get-roles --- exp_legacy/module/config/expcore/roles.lua | 2 +- exp_scenario/module/commands/roles.lua | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/exp_legacy/module/config/expcore/roles.lua b/exp_legacy/module/config/expcore/roles.lua index 14fd9695..9ad1a593 100644 --- a/exp_legacy/module/config/expcore/roles.lua +++ b/exp_legacy/module/config/expcore/roles.lua @@ -274,7 +274,7 @@ local default = Roles.new_role("Guest", "") "command/tag", "command/tag-clear", "command/commands", - "command/get-role", + "command/get-roles", "command/locate", "command/create-report", "command/ratio", diff --git a/exp_scenario/module/commands/roles.lua b/exp_scenario/module/commands/roles.lua index 7f519bf3..7adbb3a1 100644 --- a/exp_scenario/module/commands/roles.lua +++ b/exp_scenario/module/commands/roles.lua @@ -35,10 +35,9 @@ Commands.new("unassign-role", { "exp-commands_roles.description-unassign" }) end) --- Lists all roles in they correct order -Commands.new("get-role", { "exp-commands_roles.description-get" }) +Commands.new("get-roles", { "exp-commands_roles.description-get" }) :optional("player", { "exp-commands_roles.arg-player-get" }, Commands.types.player) :add_aliases{ "roles" } - :add_flags{ "admin_only" } :register(function(player, other_player) --- @cast other_player LuaPlayer? local roles = get_roles_ordered() From 64e31adbc96cb374786ca413bcb590661f3f3a49 Mon Sep 17 00:00:00 2001 From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:38:31 +0000 Subject: [PATCH 4/4] Fix toolbar buttons not showing on role assign --- exp_gui/module/toolbar.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exp_gui/module/toolbar.lua b/exp_gui/module/toolbar.lua index 9ffb4595..a0eaabc1 100644 --- a/exp_gui/module/toolbar.lua +++ b/exp_gui/module/toolbar.lua @@ -494,7 +494,7 @@ function Toolbar._ensure_consistency(player) if type(allowed) == "function" then allowed = allowed(player, element) end - element.visible = allowed and element.visible or false + element.visible = allowed or false list[button.name].visible = element.visible -- Update the toggle state and hide the linked left element if the button is not allowed