fixed music up.

This commit is contained in:
Bryce Covert
2017-06-21 20:07:57 -07:00
parent 0ac95fb8f9
commit 7857c8cf09
19 changed files with 40 additions and 32 deletions

View File

@@ -497,8 +497,8 @@
(let [time (get-in entities [:state :time])
musics (:musics entities)
override-music (musics (get-in entities [:music-override :value]))
current-music (musics (get-in entities [:room :music]))
current-time-music (musics (get-in entities [:room :music time]))]
current-music (musics (get-in entities [:room-musics (get-in entities [:state :last-room])]))
current-time-music (musics (get-in entities [:room-musics (get-in entities [:state :last-room]) time]))]
(or override-music current-music current-time-music)))