Skip to content

Commit

Permalink
Fix /lights from keeping lights off if the background wasn't changed …
Browse files Browse the repository at this point in the history
…while they were off. [#53] (#52)

* Fix /bg turning on lights in previously dark rooms.

* Update segment and internal versions.

* Update CHANGELOG.md.

* Fix /lights issue(this time for real).
  • Loading branch information
RaveMaster073 authored May 4, 2020
1 parent 054a88f commit 154c187
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -385,4 +385,7 @@
* Fixed incorrect error messages being sent in case the server's system fails to open an area list or music list file.

### 200430a (4.2.3-post10)
* Reverted backwards incompatible change that prevented music lists that did not list length for a track (meaning they did not want them to be looped) from being loaded.
* Reverted backwards incompatible change that prevented music lists that did not list length for a track (meaning they did not want them to be looped) from being loaded.

### 200503a (4.2.3-post11)
* Fixed lights staying off if they were turned on again without changing the background.
4 changes: 2 additions & 2 deletions server/area_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def change_background(self, bg, validate=True, override_blind=False):
if c.is_blind and not override_blind:
c.send_command('BN', self.server.config['blackout_background'])
else:
c.send_command('BN', bg)
c.send_command('BN', self.background)

def get_chars_unusable(self, allow_restricted=False, more_unavail_chars=None):
"""
Expand Down Expand Up @@ -520,7 +520,7 @@ def change_lights(self, new_lights, initiator=None):
else:
if self.background != self.server.config['blackout_background']:
self.background_backup = self.background
intended_background = self.server.config['blackout_background']
intended_background = self.background

self.lights = new_lights
self.change_background(intended_background, validate=False) # Allow restoring custom bg.
Expand Down
4 changes: 2 additions & 2 deletions server/tsuserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def __init__(self, protocol=None, client_manager=None, in_test=False):
self.release = 4
self.major_version = 2
self.minor_version = 3
self.segment_version = 'post10'
self.internal_version = '200430a'
self.segment_version = 'post11'
self.internal_version = '200503a'
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 154c187

Please sign in to comment.