h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-05 02:23:38 +08:00
Code Issues Releases Wiki Activity

Merge pull request #36523 from smoogipoo/fix-team-display

Browse Source 
Fix multiplayer team display becoming inconsistent
This commit is contained in:
Bartłomiej Dach
2026-01-29 10:20:21 +01:00
committed by GitHub
Unverified
parent 1885ab86f5 586b2987a7
commit 5468215de8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/OnlinePlay/Multiplayer/Participants/TeamDisplay.cs
+4 -6
View File
@@ -106,14 +106,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
clickableContent.TooltipText = "Change team";
}
// reset to ensure samples don't play
DisplayedTeam = null;
updateState();
updateState(false);
}
private void onRoomUpdated() => Scheduler.AddOnce(updateState);
private void onRoomUpdated() => Scheduler.AddOnce(() => updateState(true));
private void updateState()
private void updateState(bool playSamples)
{
// we don't have a way of knowing when an individual user's state has updated, so just handle on RoomUpdated for now.
@@ -129,7 +127,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
// only play the sample if an already valid team changes to another valid team.
// this avoids playing a sound for each user if the match type is changed to/from a team mode.
if (newTeam != null && DisplayedTeam != null)
if (playSamples && newTeam != null && DisplayedTeam != null)
sampleTeamSwap?.Play();
DisplayedTeam = newTeam;