fix: lobby button updating

Author: R-unic

src/client/components/teleport-portal.ts

@@ -53,7 +53,8 @@ export class TeleportPortal extends DestroyableComponent<Attributes, PortalModel
         root.CFrame = destinationPart.CFrame.add(new Vector3(0, 6, 0));
         humanoid.WalkSpeed = defaultWalkSpeed;
 
-        this.checkpoints.setInLobby(false, true);
+        this.checkpoints.notLobbyNotObby = true;
+        this.checkpoints.updateInLobby();
         if (this.instance.HasTag("PvPPortal")) {
           Events.tools.addItemToBackpack("PvPSword", "ExtraItems", true);
           let lobbyUpdateDebounce = false;

src/client/components/ui/lobby-button.ts

@@ -32,6 +32,6 @@ export class LobbyButton extends BaseComponent<{}, ImageButton & { Icon: ImageLa
   }
 
   private updateIcon(inLobby: boolean): void {
-    this.instance.Icon.Image = inLobby ? this.obbyIcon : this.lobbyIcon;
+    this.instance.Icon.Image = inLobby && !this.checkpoints.notLobbyNotObby ? this.obbyIcon : this.lobbyIcon;
   }
 }

src/client/controllers/checkpoints.ts

@@ -21,8 +21,9 @@ const STAGE_ARROW_COOLDOWN = 0.1;
 @Controller({ loadOrder: 2 })
 export class CheckpointsController implements OnInit, OnDataUpdate, LogStart {
   public readonly offsetUpdated = new Signal<(newStage: number) => void>;
-  public readonly inLobbyUpdated = new Signal<(inLobby: boolean, onlyUpdateButton: boolean) => void>;
+  public readonly inLobbyUpdated = new Signal<(inLobby: boolean) => void>;
   public inLobby = true;
+  public notLobbyNotObby = false;
   public stage = 0;
 
   private stageOffset = 0;
@@ -110,15 +111,16 @@ export class CheckpointsController implements OnInit, OnDataUpdate, LogStart {
     return clamp(this.stage + this.stageOffset, 0, TOTAL_STAGE_COUNT + 1);
   }
 
-  public setInLobby(inLobby: boolean, onlyUpdateButton?: boolean): void {
-    if (!onlyUpdateButton)
-      this.inLobby = inLobby;
+  public setInLobby(inLobby: boolean): void {
+    if (inLobby)
+      this.notLobbyNotObby = false;
 
-    this.updateInLobby(onlyUpdateButton, onlyUpdateButton ? inLobby : undefined);
+    this.inLobby = inLobby;
+    this.updateInLobby();
   }
 
-  private updateInLobby(onlyUpdateButton = false, overrideInLobby?: boolean): void {
-    this.inLobbyUpdated.Fire(overrideInLobby ?? this.inLobby, onlyUpdateButton);
+  public updateInLobby(): void {
+    this.inLobbyUpdated.Fire(this.inLobby);
   }
 
   private update(advancing = false): void {

src/client/controllers/lobby-music.ts

@@ -18,8 +18,8 @@ export class LobbyMusicController implements OnInit, LogStart {
   ) { }
 
   public onInit(): void {
-    this.checkpoints.inLobbyUpdated.Connect((inLobby, onlyUpdateButton) => {
-      if (onlyUpdateButton) return;
+    this.checkpoints.inLobbyUpdated.Connect(inLobby => {
+      if (this.checkpoints.notLobbyNotObby) return;
       if (inLobby) {
         if (!this.currentSong?.IsPlaying)
           this.playCurrentSong();

src/client/controllers/lobby.ts

@@ -19,8 +19,8 @@ export class LobbyController implements OnInit, OnCharacterAdd {
   ) { }
 
   public onInit(): void {
-    this.checkpoints.inLobbyUpdated.Connect(async (inLobby, onlyUpdateButton) => {
-      if (onlyUpdateButton) return;
+    this.checkpoints.inLobbyUpdated.Connect(async inLobby => {
+      if (this.checkpoints.notLobbyNotObby) return;
       const zoneName = <TextLabel>PlayerGui.WaitForChild("Main").WaitForChild("Main").WaitForChild("StageInfo").WaitForChild("ZoneName")
       const zoneMusicEnabled = await this.settings.get<boolean>("music");
       zoneName.Visible = !inLobby;