Skip to content

Commit 4183122

Browse files
Undid the spell, item toy check - it is never consistent. Reverting to old version
1 parent 237a126 commit 4183122

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

Angleur.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ function Angleur_ActionHandler(self)
417417
--______________________________________________________________________________________________________________________________________
418418
-- Interaction of Raft & Swimming - A bit more complex logic structure, hence the grouping together
419419
--______________________________________________________________________________________________________________________________________
420-
local raftValid = angleurToys.selectedRaftTable.hasToy == true and AngleurConfig.raftEnabled and angleurToys.selectedRaftTable.loaded and C_PlayerInfo.CanUseItem(angleurToys.selectedRaftTable.toyID)
420+
local raftValid = angleurToys.selectedRaftTable.hasToy == true and AngleurConfig.raftEnabled and angleurToys.selectedRaftTable.loaded
421421
-- Execute & Return Case: Player has rafts enabled + is rafted + the active raft has less than 60 seconds remaining
422422
if raftValid and rafted and C_UnitAuras.GetPlayerAuraBySpellID(auraIDHolders.raft) then
423423
local remainingAuraDuration = C_UnitAuras.GetPlayerAuraBySpellID(auraIDHolders.raft).expirationTime - GetTime()
@@ -449,9 +449,8 @@ function Angleur_ActionHandler(self)
449449
end
450450
--______________________________________________________________________________________________________________________________________
451451

452-
453452
local _, cooldownOversized = C_Container.GetItemCooldown(angleurToys.selectedOversizedBobberTable.toyID)
454-
local oversizedReady = angleurToys.selectedOversizedBobberTable.hasToy == true and AngleurConfig.oversizedEnabled and angleurToys.selectedOversizedBobberTable.loaded and C_PlayerInfo.CanUseItem(angleurToys.selectedOversizedBobberTable.toyID) and not oversizedBobbered and cooldownOversized == 0
453+
local oversizedReady = angleurToys.selectedOversizedBobberTable.hasToy == true and AngleurConfig.oversizedEnabled and angleurToys.selectedOversizedBobberTable.loaded and not oversizedBobbered and cooldownOversized == 0
455454
if oversizedReady then
456455
action = "oversized"
457456
performAction(self, assignKey, action)
@@ -467,7 +466,7 @@ function Angleur_ActionHandler(self)
467466
end
468467

469468
local _, cooldownCrate = C_Container.GetItemCooldown(angleurToys.selectedCrateBobberTable.toyID)
470-
local crateReady = (AngleurConfig.crateEnabled and not crateBobbered) and (angleurToys.selectedCrateBobberTable.hasToy == true and cooldownCrate == 0) and angleurToys.selectedCrateBobberTable.loaded and C_PlayerInfo.CanUseItem(angleurToys.selectedCrateBobberTable.toyID)
469+
local crateReady = (AngleurConfig.crateEnabled and not crateBobbered) and (angleurToys.selectedCrateBobberTable.hasToy == true and cooldownCrate == 0) and angleurToys.selectedCrateBobberTable.loaded
471470
if crateReady then
472471
action = "crate"
473472
performAction(self, assignKey, action)

AngleurMists.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ function Angleur_ActionHandler(self)
520520
--______________________________________________________________________________________________________________________________________
521521
-- Interaction of Raft & Swimming - A bit more complex logic structure, hence the grouping together
522522
--______________________________________________________________________________________________________________________________________
523-
local raftValid = angleurToys.selectedRaftTable.hasToy == true and AngleurConfig.raftEnabled and angleurToys.selectedRaftTable.loaded and C_PlayerInfo.CanUseItem(angleurToys.selectedRaftTable.toyID)
523+
local raftValid = angleurToys.selectedRaftTable.hasToy == true and AngleurConfig.raftEnabled and angleurToys.selectedRaftTable.loaded
524524
-- Execute & Return Case: Player has rafts enabled + is rafted + the active raft has less than 60 seconds remaining
525525
if raftValid and rafted and C_UnitAuras.GetPlayerAuraBySpellID(auraIDHolders.raft) then
526526
local remainingAuraDuration = C_UnitAuras.GetPlayerAuraBySpellID(auraIDHolders.raft).expirationTime - GetTime()

0 commit comments

Comments
 (0)