Skip to content

Commit

Permalink
Fix players being unable to play a track via the music list if it is …
Browse files Browse the repository at this point in the history
…a track of their hub music list but not of their personal music list
  • Loading branch information
Chrezm committed Dec 5, 2022
1 parent 51b865e commit c0b437a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 6 additions & 3 deletions server/area_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions server/tsuserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c0b437a

Please sign in to comment.