Merge pull request #3934 from wowsims/apl

Fix panic when mixing Cast and Channel for channeled spells
wowsims · Oct 22, 2023 · da78d1c · da78d1c
2 parents b406014 + 65a1c07
commit da78d1c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -234,6 +234,11 @@ func (apl *APLRotation) getNextAction(sim *Simulation) *APLAction {
 
 func (apl *APLRotation) shouldInterruptChannel(sim *Simulation) bool {
 	channeledDot := apl.unit.ChanneledDot
+	if channeledDot == nil {
+		// Cast was started by a different APL action (not Channel) so is non-interruptible.
+		return false
+	}
+
 	if channeledDot.MaxTicksRemaining() == 0 {
 		// Channel has ended, but apl.unit.ChanneledDot hasn't been cleared yet meaning the aura is still active.
 		return false