Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #234 / Exclude stop track from alias lookup. (#245)

Browse Source 
* Exclude ~stop.mp3 from alias lookup

* Fix auto-looping for on-join songs.
This commit is contained in:
Salanto 2022-03-15 00:24:47 +01:00 committed by GitHub
parent 09662620c8
commit c85471d2cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/area_data.cpp
View File

@ -95,7 +95,9 @@ void AreaData::clientJoinedArea(int f_charId, int f_userId)
}
m_joined_ids.append(f_userId);
emit userJoinedArea(m_index, f_userId);
emit sendAreaPacketClient(AOPacket("MC",{m_currentMusic, QString::number(-1)}), f_userId);
//The name will never be shown as we are using a spectator ID. Still nice for people who network sniff.
//We auto-loop this so you'll never sit in silence unless wanted.
emit sendAreaPacketClient(AOPacket("MC",{m_currentMusic, QString::number(-1), ConfigManager::serverName(), QString::number(1)}), f_userId);
}
QList<int> AreaData::owners() const

21
core/src/packets.cpp
View File

@ -313,6 +313,8 @@ void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPack
else
l_effects = "0";
QString l_final_song;
//As categories can be used to stop music we need to check if it has a dot for the extension. If not, we assume its a category.
if (!l_argument.contains("."))
l_final_song = "~stop.mp3";
else
@ -325,12 +327,21 @@ void AOClient::pktChangeMusic(AreaData* area, int argc, QStringList argv, AOPack
return;
}
QPair<QString,float> l_song = m_music_manager->songInformation(l_final_song, m_current_area);
QString l_real_name = l_song.first;
AOPacket l_music_change("MC", {l_real_name, argv[1], m_showname, "1", "0", l_effects});
area->setCurrentMusic(l_final_song);
area->setMusicPlayedBy(m_showname);
if (l_final_song != "~stop.mp3") {
//We might have an aliased song. We check for its real songname and send it to the clients.
QPair<QString,float> l_song = m_music_manager->songInformation(l_final_song, m_current_area);
l_final_song = l_song.first;
}
AOPacket l_music_change("MC", {l_final_song, argv[1], m_showname, "1", "0", l_effects});
server->broadcast(l_music_change, m_current_area);
//Since we can't ensure a user has their showname set, we check if its empty to prevent
//"played by ." in /currentmusic.
if (m_showname.isEmpty()) {
area->changeMusic(m_current_char,l_final_song);
return;
}
area->changeMusic(m_showname,l_final_song);
return;
}