From 5b2d96fed9a8a09c9517c80567a906dad8a19104 Mon Sep 17 00:00:00 2001 From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Date: Fri, 17 May 2024 03:55:01 -0700 Subject: [PATCH] Allow those with the CM perm to play music (#354) regardless of what the area thinks. a SUPER user not being able to play a song is a bit odd --- core/src/commands/music.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/commands/music.cpp b/core/src/commands/music.cpp index 96eebb7..6cdfbfd 100644 --- a/core/src/commands/music.cpp +++ b/core/src/commands/music.cpp @@ -34,7 +34,8 @@ void AOClient::cmdPlay(int argc, QStringList argv) return; } AreaData *l_area = server->getAreaById(m_current_area); - if (!l_area->owners().contains(m_id) && !l_area->isPlayEnabled()) { // Make sure we have permission to play music + const ACLRole l_role = server->getACLRolesHandler()->getRoleById(m_acl_role_id); + if (!l_area->owners().contains(m_id) && !l_area->isPlayEnabled() && !l_role.checkPermission(ACLRole::CM)) { // Make sure we have permission to play music sendServerMessage("Free music play is disabled in this area."); return; }