Merge branch 'master' into vigo/item-sets

# Conflicts: # sim/common/wotlk/nibelung.go
wowsims · Sep 9, 2023 · 91e5988 · 91e5988
2 parents cc415bc + ffc92d2
commit 91e5988
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/sim/common/wotlk/nibelung.go b/sim/common/wotlk/nibelung.go
@@ -117,7 +117,12 @@ func MakeNibelungTriggerAura(agent core.Agent, isHeroic bool) {
 		ProcChance: 0.02,
 		ICD:        time.Millisecond * 250,
 		ActionID:   core.ActionID{SpellID: procSpellId},
-		Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) {
+		Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
+			// dummy proc spell can't proc nibelung
+			if spell == spell.Unit.GetDummyProcSpell() {
+				return
+			}
+
 			for _, petAgent := range character.PetAgents {
 				if valkyr, ok := petAgent.(*ValkyrPet); ok && !valkyr.IsEnabled() {
 					valkyr.registerSmite(isHeroic)