Merge pull request #4128 from wowsims/fixes

Fix bug where APL could select wrong spell, and warlock+warrior tests…
wowsims · Jan 7, 2024 · 89237db · 89237db
2 parents 92f2756 + cfececa
commit 89237db
Show file tree

Hide file tree

Showing 13 changed files with 2,609 additions and 2,868 deletions.
diff --git a/sim/core/apl_helpers.go b/sim/core/apl_helpers.go
@@ -148,7 +148,12 @@ func (rot *APLRotation) GetAPLSpell(spellId *proto.ActionID) *Spell {
 			}
 		}
 	} else {
-		spell = rot.unit.GetSpell(actionID)
+		for _, s := range rot.unit.Spellbook {
+			if s.ActionID.SameAction(actionID) && s.Flags.Matches(SpellFlagAPL) {
+				spell = s
+				break
+			}
+		}
 	}
 
 	if spell == nil {