Remove extraneous calls to WaitForMana()

wowsims · Jan 21, 2024 · d5f0012 · d5f0012
1 parent d8584e9
commit d5f0012
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/sim/hunter/explosive_trap.go b/sim/hunter/explosive_trap.go
@@ -113,11 +113,9 @@ func (hunter *Hunter) registerExplosiveTrapSpell(timer *core.Timer) {
 			hunter.AutoAttacks.DelayRangedUntil(sim, doneAt+time.Millisecond*500)
 
 			if layTrapAt == sim.CurrentTime {
-				success := hunter.ExplosiveTrap.Cast(sim, target)
+				hunter.ExplosiveTrap.Cast(sim, target)
 				if doneAt > hunter.GCD.ReadyAt() {
 					hunter.GCD.Set(doneAt)
-				} else if !success {
-					hunter.WaitForMana(sim, hunter.ExplosiveTrap.CurCast.Cost)
 				}
 			} else {
 				// Make sure the GCD doesn't get used while we're waiting.
@@ -127,11 +125,9 @@ func (hunter *Hunter) registerExplosiveTrapSpell(timer *core.Timer) {
 					DoAt: layTrapAt,
 					OnAction: func(sim *core.Simulation) {
 						hunter.GCD.Reset()
-						success := hunter.ExplosiveTrap.Cast(sim, target)
+						hunter.ExplosiveTrap.Cast(sim, target)
 						if doneAt > hunter.GCD.ReadyAt() {
 							hunter.GCD.Set(doneAt)
-						} else if !success {
-							hunter.WaitForMana(sim, hunter.ExplosiveTrap.CurCast.Cost)
 						}
 					},
 				})

diff --git a/sim/mage/water_elemental.go b/sim/mage/water_elemental.go
@@ -97,9 +97,7 @@ func (we *WaterElemental) ExecuteCustomRotation(sim *core.Simulation) {
 		return
 	}
 
-	if success := spell.Cast(sim, we.CurrentTarget); !success {
-		we.WaitForMana(sim, spell.CurCast.Cost)
-	}
+	spell.Cast(sim, we.CurrentTarget)
 }
 
 // These numbers are just rough guesses based on looking at some logs.

diff --git a/sim/shaman/fire_elemental_pet.go b/sim/shaman/fire_elemental_pet.go
@@ -103,7 +103,6 @@ func (fireElemental *FireElemental) ExecuteCustomRotation(sim *core.Simulation)
 	}
 
 	if fireElemental.FireNova.DefaultCast.Cost > fireElemental.CurrentMana() {
-		fireElemental.WaitForMana(sim, fireElemental.FireNova.DefaultCast.Cost)
 		return
 	}
 

diff --git a/sim/warlock/pet.go b/sim/warlock/pet.go
@@ -303,9 +303,7 @@ func (wp *WarlockPet) ExecuteCustomRotation(sim *core.Simulation) {
 		return
 	}
 
-	if success := wp.primaryAbility.Cast(sim, wp.CurrentTarget); !success {
-		wp.WaitForMana(sim, wp.primaryAbility.CurCast.Cost)
-	}
+	wp.primaryAbility.Cast(sim, wp.CurrentTarget)
 }
 
 func (warlock *Warlock) makeStatInheritance() core.PetStatInheritance {