From c14fd36ce9140918df9babe2f09ffc72c013fd0a Mon Sep 17 00:00:00 2001
From: The Grox Empire <47816228+TheGroxEmpire@users.noreply.github.com>
Date: Fri, 3 Nov 2023 18:17:05 +0700
Subject: [PATCH] Warrior: Bloodsurge proc will overwrite T10 4-set proc with
 less than 5s duration (2)

---
 sim/warrior/talents.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sim/warrior/talents.go b/sim/warrior/talents.go
index e528395cd8..b03930cfee 100644
--- a/sim/warrior/talents.go
+++ b/sim/warrior/talents.go
@@ -234,9 +234,6 @@ func (warrior *Warrior) applyBloodsurge() {
 		ActionID: core.ActionID{SpellID: 46916},
 		Duration: time.Second * 5,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			if warrior.Ymirjar4pcProcAura.IsActive() && warrior.Ymirjar4pcProcAura.Duration < time.Second*5 {
-				warrior.Ymirjar4pcProcAura.Deactivate(sim)
-			}
 			warrior.Slam.DefaultCast.CastTime = 0
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
@@ -297,9 +294,12 @@ func (warrior *Warrior) applyBloodsurge() {
 
 			warrior.lastBloodsurgeProc = sim.CurrentTime
 
-			// as per https://www.wowhead.com/wotlk/spell=70847/item-warrior-t10-melee-4p-bonus#comments,
-			//  the improved aura is not overwritten by the regular one, but simply refreshed
-			if ymirjar4Set && (sim.RandomFloat("Ymirjar 4pc") < 0.2 || warrior.Ymirjar4pcProcAura.IsActive()) {
+			// As of 3.4.351943, bloodsurge will refresh Ymirjar 4pc duration if Ymirjar 4pc duration is >5s.
+			// However, it'll replace it if Ymirjar 4pc duration is <5s.
+			if warrior.Ymirjar4pcProcAura.IsActive() && warrior.Ymirjar4pcProcAura.RemainingDuration(sim) < time.Second*5 {
+				warrior.Ymirjar4pcProcAura.Deactivate(sim)
+
+			} else if ymirjar4Set && (sim.RandomFloat("Ymirjar 4pc") < 0.2 || warrior.Ymirjar4pcProcAura.IsActive()) {
 				warrior.BloodsurgeAura.Deactivate(sim)
 				warrior.Ymirjar4pcProcAura.Activate(sim)