From 6d071f61b1f49baa72bf227f37e67d31cfc839a9 Mon Sep 17 00:00:00 2001 From: James Onnen Date: Thu, 16 Oct 2025 13:22:53 -0700 Subject: [PATCH 1/2] fix: Fix misc things --- .../src/Client/CoreGuiEnabler.lua | 3 ++- src/playerutils/package.json | 1 + src/playerutils/src/Shared/RxPlayerUtils.lua | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/coreguienabler/src/Client/CoreGuiEnabler.lua b/src/coreguienabler/src/Client/CoreGuiEnabler.lua index 652cb612fe..d07f6c8da5 100644 --- a/src/coreguienabler/src/Client/CoreGuiEnabler.lua +++ b/src/coreguienabler/src/Client/CoreGuiEnabler.lua @@ -97,8 +97,9 @@ function CoreGuiEnabler.new(): CoreGuiEnabler UserInputService.ModalEnabled = not isEnabled end) + local wasEnabled = StarterPlayer.EnableMouseLockOption self:AddState("EnableMouseLockOption", function(isEnabled) - StarterPlayer.EnableMouseLockOption = isEnabled + StarterPlayer.EnableMouseLockOption = wasEnabled and isEnabled end) self:AddState("MouseIconEnabled", function(isEnabled) diff --git a/src/playerutils/package.json b/src/playerutils/package.json index 86d2eaf309..fb1ab6708b 100644 --- a/src/playerutils/package.json +++ b/src/playerutils/package.json @@ -29,6 +29,7 @@ }, "dependencies": { "@quenty/brio": "file:../brio", + "@quenty/characterutils": "file:../characterutils", "@quenty/instanceutils": "file:../instanceutils", "@quenty/loader": "file:../loader", "@quenty/maid": "file:../maid", diff --git a/src/playerutils/src/Shared/RxPlayerUtils.lua b/src/playerutils/src/Shared/RxPlayerUtils.lua index 7f7ff3d678..fb4c87b1bd 100644 --- a/src/playerutils/src/Shared/RxPlayerUtils.lua +++ b/src/playerutils/src/Shared/RxPlayerUtils.lua @@ -13,6 +13,8 @@ local Maid = require("Maid") local Observable = require("Observable") local Rx = require("Rx") local RxInstanceUtils = require("RxInstanceUtils") +local RxBrioUtils = require("RxBrioUtils") +local RxCharacterUtils = require("RxCharacterUtils") local RxPlayerUtils = {} @@ -52,6 +54,28 @@ function RxPlayerUtils.observePlayersBrio(predicate: Rx.Predicate?): Obs end) :: any end +--[=[ + Observes the character model for the player +]=] +function RxPlayerUtils.observeCharactersBrio(): Observable.Observable> + return RxPlayerUtils.observePlayersBrio():Pipe({ + RxBrioUtils.flatMapBrio(function(player) + return RxCharacterUtils.observeLastCharacterBrio(player) + end) + }) +end + +--[=[ + Observes the character model for the player +]=] +function RxPlayerUtils.observeHumanoidsBrio(): Observable.Observable> + return RxPlayerUtils.observePlayersBrio():Pipe({ + RxBrioUtils.flatMapBrio(function(player) + return RxCharacterUtils.observeLastHumanoidBrio(player) + end) + }) +end + --[=[ Observes the current local player From 2d60e0b98412ce71474c60782745e1ba849c4205 Mon Sep 17 00:00:00 2001 From: James Onnen Date: Thu, 16 Oct 2025 19:26:31 -0700 Subject: [PATCH 2/2] fix: Format code --- src/playerutils/src/Shared/RxPlayerUtils.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/playerutils/src/Shared/RxPlayerUtils.lua b/src/playerutils/src/Shared/RxPlayerUtils.lua index fb4c87b1bd..1163f7a3e5 100644 --- a/src/playerutils/src/Shared/RxPlayerUtils.lua +++ b/src/playerutils/src/Shared/RxPlayerUtils.lua @@ -12,9 +12,9 @@ local Brio = require("Brio") local Maid = require("Maid") local Observable = require("Observable") local Rx = require("Rx") -local RxInstanceUtils = require("RxInstanceUtils") local RxBrioUtils = require("RxBrioUtils") local RxCharacterUtils = require("RxCharacterUtils") +local RxInstanceUtils = require("RxInstanceUtils") local RxPlayerUtils = {} @@ -61,7 +61,7 @@ function RxPlayerUtils.observeCharactersBrio(): Observable.Observable