Merge pull request #4130 from wowsims/fixes

Fix DK APL breakage
wowsims · Jan 7, 2024 · 5ecc876 · 5ecc876
2 parents 94a51c5 + d5c3a7a
commit 5ecc876
Show file tree

Hide file tree

Showing 6 changed files with 1,504 additions and 1,497 deletions.
diff --git a/sim/core/apl_helpers.go b/sim/core/apl_helpers.go
@@ -148,12 +148,19 @@ func (rot *APLRotation) GetAPLSpell(spellId *proto.ActionID) *Spell {
 			}
 		}
 	} else {
+		// Prefer spells marked with APL, but fallback to unmarked spells.
+		var aplSpell *Spell
 		for _, s := range rot.unit.Spellbook {
 			if s.ActionID.SameAction(actionID) && s.Flags.Matches(SpellFlagAPL) {
-				spell = s
+				aplSpell = s
 				break
 			}
 		}
+		if aplSpell == nil {
+			spell = rot.unit.GetSpell(actionID)
+		} else {
+			spell = aplSpell
+		}
 	}
 
 	if spell == nil {