fix holy shield no charges bug

wowsims · Dec 26, 2024 · cf338b0 · cf338b0
1 parent 26b8f3e
commit cf338b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/sim/paladin/holy_shield.go b/sim/paladin/holy_shield.go
@@ -67,7 +67,9 @@ func (paladin *Paladin) registerHolyShield() {
 			Duration:  time.Second * 10,
 			MaxStacks: numCharges,
 			OnGain: func(aura *core.Aura, sim *core.Simulation) {
-				aura.SetStacks(sim, numCharges)
+				if aura.MaxStacks > 0 {
+					aura.SetStacks(sim, aura.MaxStacks)
+				}
 				paladin.AddStatDynamic(sim, stats.Block, blockBonus)
 			},
 			OnExpire: func(aura *core.Aura, sim *core.Simulation) {

diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go
@@ -179,7 +179,6 @@ var ItemSetLawbringerWill = core.NewItemSet(core.ItemSet{
 					blockBonus := 30.0 * core.BlockRatingPerBlockChance
 
 					for i, values := range HolyShieldValues {
-
 						if paladin.Level < values.level {
 							break
 						}
@@ -358,7 +357,6 @@ var ItemSetWilfullJudgement = core.NewItemSet(core.ItemSet{
 			}
 
 			blockBonus := 40.0 * core.BlockRatingPerBlockChance
-			numCharges := int32(4)
 
 			paladin.RegisterAura(core.Aura{
 				Label: "S03 - Item - T2 - Paladin - Protection 2P Bonus",
@@ -367,11 +365,16 @@ var ItemSetWilfullJudgement = core.NewItemSet(core.ItemSet{
 						if paladin.Level < HolyShieldValues[i].level {
 							break
 						}
+
+						oldOnGain := hsAura.OnGain
 						hsAura.OnGain = func(aura *core.Aura, sim *core.Simulation) {
-							aura.SetStacks(sim, numCharges)
+							oldOnGain(aura, sim)
 							paladin.AddStatDynamic(sim, stats.Block, blockBonus)
 						}
+
+						oldOnExpire := hsAura.OnExpire
 						hsAura.OnExpire = func(aura *core.Aura, sim *core.Simulation) {
+							oldOnExpire(aura, sim)
 							paladin.AddStatDynamic(sim, stats.Block, -blockBonus)
 						}
 					}