diff --git a/CHANGELOG.md b/CHANGELOG.md index 022b2f3d..b9a7d056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -879,3 +879,6 @@ - The area lists file `config/area_lists.yaml` - The music lists file `config/music_lists.yaml` - The area templates file `config/area_templates.yaml` + +## 221204a (5.0.0-post1) +* Fixed players being unable to play a track via the music list if it is a track of their hub music list but not of their personal music list diff --git a/server/area_manager.py b/server/area_manager.py index e0c38d1e..3055b676 100644 --- a/server/area_manager.py +++ b/server/area_manager.py @@ -778,9 +778,12 @@ def play_track(self, name: str, client: ClientManager.Client, try: name, length, source = client.music_manager.get_music_data(name) except MusicError.MusicNotFoundError: - if raise_if_not_found: - raise - length, source = -1, '' + try: + name, length, source = client.hub.music_manager.get_music_data(name) + except MusicError.MusicNotFoundError: + if raise_if_not_found: + raise + length, source = -1, '' if 'name' not in pargs: pargs['name'] = name diff --git a/server/tsuserver.py b/server/tsuserver.py index ddd7d959..02d15324 100644 --- a/server/tsuserver.py +++ b/server/tsuserver.py @@ -67,8 +67,8 @@ def __init__(self, client_manager_type: Type[ClientManager] = None): self.release = 5 self.major_version = 0 self.minor_version = 0 - self.segment_version = '' - self.internal_version = '221123a' + self.segment_version = 'post1' + self.internal_version = '221204a' version_string = self.get_version_string() self.software = 'TsuserverDR {}'.format(version_string) self.version = 'TsuserverDR {} ({})'.format(version_string, self.internal_version)