fix channel interrupting

wowsims · Dec 28, 2024 · 01639fe · 01639fe
1 parent 28c54ad
commit 01639fe
Show file tree

Hide file tree

Showing 6 changed files with 215 additions and 205 deletions.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -190,6 +190,10 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 		return
 	}
 
+	if apl.shouldInterruptChannel(sim) {
+		apl.unit.ChanneledDot.Cancel(sim)
+	}
+
 	if apl.unit.IsChanneling(sim) && !apl.allowCastWhileChanneling {
 		return
 	}

diff --git a/sim/core/cast.go b/sim/core/cast.go
@@ -204,8 +204,14 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 			return spell.castFailureHelper(sim, "casting/channeling %v for %s, curTime = %s", hc.ActionID, hc.Expires-sim.CurrentTime, sim.CurrentTime)
 		}
 
-		if dot := spell.Unit.ChanneledDot; spell.Unit.IsChanneling(sim) && !spell.Flags.Matches(SpellFlagCastWhileChanneling) && (spell.Unit.Rotation.interruptChannelIf == nil || !spell.Unit.Rotation.interruptChannelIf.GetBool(sim)) {
-			return spell.castFailureHelper(sim, "channeling %v for %s, curTime = %s", dot.ActionID, dot.expires-sim.CurrentTime, sim.CurrentTime)
+		if dot := spell.Unit.ChanneledDot; spell.Unit.IsChanneling(sim) {
+			if spell.Unit.Rotation.shouldInterruptChannel(sim) {
+				dot.Cancel(sim)
+			}
+
+			if !spell.Flags.Matches(SpellFlagCastWhileChanneling) {
+				return spell.castFailureHelper(sim, "channeling %v for %s, curTime = %s", dot.ActionID, dot.expires-sim.CurrentTime, sim.CurrentTime)
+			}
 		}
 
 		if effectiveTime := spell.CurCast.EffectiveTime(); effectiveTime != 0 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,6 +190,10 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) { @@
     		return
     	}
+    	if apl.shouldInterruptChannel(sim) {
+    		apl.unit.ChanneledDot.Cancel(sim)
+    	}
     	if apl.unit.IsChanneling(sim) && !apl.allowCastWhileChanneling {
     		return
     	}
@@ Expand Down @@