Merge pull request #3452 from wowsims/apl

Fix warrior panic
wowsims · Aug 13, 2023 · 6b0230d · 6b0230d
2 parents f8e9945 + 57c35fd
commit 6b0230d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/sim/warrior/heroic_strike_cleave.go b/sim/warrior/heroic_strike_cleave.go
@@ -43,7 +43,9 @@ func (warrior *Warrior) registerHeroicStrikeSpell() *core.Spell {
 			}
 
 			spell.DealDamage(sim, result)
-			warrior.curQueueAura.Deactivate(sim)
+			if warrior.curQueueAura != nil {
+				warrior.curQueueAura.Deactivate(sim)
+			}
 		},
 	})
 }
@@ -87,7 +89,9 @@ func (warrior *Warrior) registerCleaveSpell() *core.Spell {
 				spell.DealDamage(sim, results[hitIndex])
 				curTarget = sim.Environment.NextTargetUnit(curTarget)
 			}
-			warrior.curQueueAura.Deactivate(sim)
+			if warrior.curQueueAura != nil {
+				warrior.curQueueAura.Deactivate(sim)
+			}
 		},
 	})
 }

diff --git a/sim/warrior/warrior.go b/sim/warrior/warrior.go
@@ -145,7 +145,7 @@ func (warrior *Warrior) Initialize() {
 
 	warrior.registerBloodrageCD()
 
-	if warrior.Shout != nil && warrior.PrecastShout {
+	if !warrior.IsUsingAPL && warrior.Shout != nil && warrior.PrecastShout {
 		warrior.RegisterPrepullAction(-10*time.Second, func(sim *core.Simulation) {
 			warrior.Shout.SkipCastAndApplyEffects(sim, nil)
 		})
@@ -154,6 +154,8 @@ func (warrior *Warrior) Initialize() {
 
 func (warrior *Warrior) Reset(_ *core.Simulation) {
 	warrior.RendValidUntil = 0
+	warrior.curQueueAura = nil
+	warrior.curQueuedAutoSpell = nil
 }
 
 func NewWarrior(character core.Character, talents string, inputs WarriorInputs) *Warrior {