Skip to content

Commit cfb3703

Browse files
committed
Midnight: Allow /raidbar and /break inside instances outside of combat, and outside instances
1 parent fd5e191 commit cfb3703

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.luacheckrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ files["Plugins/AutoReply.lua"].ignore = {
112112
}
113113
files["Plugins/Bars.lua"].ignore = {
114114
"113/C_Spell",
115+
"113/IsInInstance",
115116
"113/C_EncounterTimeline",
116117
}
117118
files["Plugins/BattleRes.lua"].ignore = {
@@ -147,6 +148,7 @@ files["Plugins/BossBlock.lua"].ignore = {
147148
}
148149
files["Plugins/Break.lua"].ignore = {
149150
"113/time",
151+
"113/IsInInstance",
150152
}
151153
files["Plugins/Messages.lua"].ignore = {
152154
"113/C_UI",

Plugins/Bars.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ do
15781578
local dbmPrefix = BigWigsLoader.dbmPrefix
15791579
local times
15801580
function plugin:SendCustomBarToGroup(message, duration)
1581-
if BigWigsLoader.isBeta then return end -- XXX 12.0 Needs fixing (not allowed in raids/dungeons atm)
1581+
if BigWigsLoader.isBeta and IsInInstance() and InCombatLockdown() then return end -- XXX 12.0 Needs more fixing? not allowed in combat in instances
15821582
if not duration or duration < 3 then BigWigs:Print(L.wrongTime) return end
15831583
if not IsInGroup() or (not UnitIsGroupLeader("player") and not UnitIsGroupAssistant("player")) then BigWigs:Print(L.requiresLeadOrAssist) return end
15841584
if not plugin:IsEnabled() then BigWigs:Enable() end

Plugins/Break.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ end
173173
local SendAddonMessage = BigWigsLoader.SendAddonMessage
174174
local dbmPrefix = BigWigsLoader.dbmPrefix
175175
BigWigsAPI.RegisterSlashCommand("/break", function(input)
176-
if BigWigsLoader.isBeta then return end -- XXX 12.0 Needs fixing (not allowed in raids/dungeons atm)
176+
if BigWigsLoader.isBeta and IsInInstance() and InCombatLockdown() then return end -- XXX 12.0 Needs more fixing? not allowed in combat in instances
177177
if not plugin:IsEnabled() then BigWigs:Enable() end
178178
if IsEncounterInProgress() then BigWigs:Print(L.encounterRestricted) return end -- Doesn't make sense to allow this in combat
179179
if not IsInGroup() or UnitIsGroupLeader("player") or UnitIsGroupAssistant("player") then -- Solo or leader/assist

0 commit comments

Comments
 (0)