Skip to content

Commit bddda28

Browse files
void finder no longer is set when exiting combat while angleur is asleep
1 parent df66b84 commit bddda28

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

midnight.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ secureActionButton:SetAttribute("macrotext", "/tar Hyper\n/cleartarget [dead]\n/
2222
secureActionButton:RegisterEvent("PLAYER_REGEN_DISABLED")
2323
secureActionButton:RegisterEvent("PLAYER_REGEN_ENABLED")
2424
local function override_Set()
25-
if not InCombatLockdown() and AngleurConfig.voidFinderEnabled and AngleurConfig.voidFinderKey then
25+
if not InCombatLockdown() and AngleurCharacter.sleeping == false and AngleurConfig.voidFinderEnabled and AngleurConfig.voidFinderKey then
2626
ClearOverrideBindings(secureActionButton)
2727
SetOverrideBindingClick(secureActionButton, false, AngleurConfig.voidFinderKey, "Angleur_VoidSecureAction")
2828
end
@@ -203,17 +203,17 @@ local function checkPatient()
203203
end
204204

205205
local function handleAuras(updateInfo)
206-
if InCombatLockdown() then return end
206+
local inCombat = InCombatLockdown()
207207
if AngleurConfig.patientEnabled == false then return end
208208
if not updateInfo then return end
209209
if AngleurCharacter.sleeping then return end
210210

211211
local added = scrubsecretvalues(updateInfo.addedAuras)
212212
local removed = scrubsecretvalues(updateInfo.removedAuraInstanceIDs)
213213
-- Added Auras
214-
if added then
214+
if added and not inCombat then
215215
for i, v in pairs(added) do
216-
local spellID = v.spellId
216+
local spellID = scrubsecretvalues(v.spellId)
217217
if spellID == PATIENT_SPELLID1 or spellID == PATIENT_SPELLID2 then
218218
activeAuras[v.auraInstanceID] = spellID
219219
Angleur_BetaPrint(debugChannel, colorDebug:WrapTextInColorCode("Patient Chest:"), "Added", activeAuras[v.auraInstanceID], "Instance ID: ", v.auraInstanceID)
@@ -225,7 +225,7 @@ local function handleAuras(updateInfo)
225225
-- Updated Auras
226226
-- nothing
227227

228-
-- Removed Auras
228+
-- Removed Auras - These are never secret, so we can access them in combat
229229
if removed then
230230
for i, v in pairs(removed) do
231231
if activeAuras[v] then

0 commit comments

Comments
 (0)