diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go
index 037ec09dd4..0c1d506053 100644
--- a/sim/common/vanilla/enchant_effects.go
+++ b/sim/common/vanilla/enchant_effects.go
@@ -39,6 +39,7 @@ func init() {
 			SpellSchool: core.SpellSchoolFire,
 			DefenseType: core.DefenseTypeMagic,
 			ProcMask:    core.ProcMaskSpellDamage,
+			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagSuppressEquipProcs,
 
 			DamageMultiplier: 1,
 			ThreatMultiplier: 1,
@@ -110,6 +111,7 @@ func init() {
 			SpellSchool: core.SpellSchoolFire,
 			DefenseType: core.DefenseTypeMagic,
 			ProcMask:    procMaskOnAuto,
+			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagSuppressEquipProcs,
 
 			DamageMultiplier: 1,
 			ThreatMultiplier: 1,
diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go
index 16e11647f7..4415fef81d 100644
--- a/sim/common/vanilla/item_effects.go
+++ b/sim/common/vanilla/item_effects.go
@@ -3577,7 +3577,7 @@ func BlazefuryTriggerAura(character *core.Character, itemID int32, triggerSpellI
 		SpellSchool:      spellSchool,
 		DefenseType:      core.DefenseTypeMagic,
 		ProcMask:         core.ProcMaskMeleeDamageProc,
-		Flags:            core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
+		Flags:            core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagSuppressEquipProcs,
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/core/consumes.go b/sim/core/consumes.go
index 22320d0f28..bb28f98705 100644
--- a/sim/core/consumes.go
+++ b/sim/core/consumes.go
@@ -477,7 +477,7 @@ func DragonBreathChiliAura(character *Character) *Aura {
 		SpellSchool: SpellSchoolFire,
 		DefenseType: DefenseTypeMagic,
 		ProcMask:    ProcMaskSpellDamageProc | ProcMaskSpellProc,
-		Flags:       SpellFlagNoOnCastComplete | SpellFlagPassiveSpell,
+		Flags:       SpellFlagNoOnCastComplete | SpellFlagPassiveSpell | SpellFlagSuppressEquipProcs,
 
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,
@@ -495,7 +495,7 @@ func DragonBreathChiliAura(character *Character) *Aura {
 		ActionID: ActionID{SpellID: 15852},
 		Duration: NeverExpires,
 		OnSpellHitDealt: func(aura *Aura, sim *Simulation, spell *Spell, result *SpellResult) {
-			if !result.Landed() || !spell.ProcMask.Matches(ProcMaskMelee) {
+			if !result.Landed() || !spell.ProcMask.Matches(ProcMaskMelee) || spell.Flags.Matches(SpellFlagSuppressEquipProcs) {
 				return
 			}
 			if icd.IsReady(sim) && sim.RandomFloat("Dragonbreath Chili") < procChance {
diff --git a/sim/paladin/retribution/TestShockadin1H.results b/sim/paladin/retribution/TestShockadin1H.results
index fe846edc5a..6a456d9211 100644
--- a/sim/paladin/retribution/TestShockadin1H.results
+++ b/sim/paladin/retribution/TestShockadin1H.results
@@ -50,12 +50,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestShockadin1H-Phase8-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.71673
-  weights: 2.8037
+  weights: 0.71649
+  weights: 1.88807
   weights: 0
-  weights: 12.43072
+  weights: 12.2998
   weights: 0
-  weights: 3.59734
+  weights: 3.57368
   weights: 0
   weights: 0
   weights: 0
@@ -63,13 +63,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.2094
-  weights: 1.90976
+  weights: 2.52927
+  weights: 1.0808
   weights: 0
   weights: 0
-  weights: 0.25754
-  weights: 90.26884
-  weights: 29.79256
+  weights: 0.25745
+  weights: 86.91402
+  weights: 34.67986
   weights: 0
   weights: 0
   weights: 0
@@ -99,114 +99,114 @@ stat_weights_results: {
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 4578.64827
-  tps: 3240.81884
-  dtps: 2.5777
-  hps: 69.40783
+  dps: 4571.84421
+  tps: 3236.31592
+  dtps: 2.70383
+  hps: 69.418
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 4683.37774
-  tps: 3314.64171
-  dtps: 2.5777
-  hps: 69.40783
+  dps: 4678.63782
+  tps: 3311.66653
+  dtps: 2.70383
+  hps: 69.418
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 4797.53355
-  tps: 3395.58598
-  dtps: 2.5777
-  hps: 69.40783
+  dps: 4790.21003
+  tps: 3390.67092
+  dtps: 2.70383
+  hps: 69.418
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 7562.45577
-  tps: 5329.07357
-  dtps: 2.34374
-  hps: 80.8128
+  dps: 7534.49066
+  tps: 5309.45407
+  dtps: 2.28632
+  hps: 80.87787
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1650.6539
-  tps: 1175.0608
-  dtps: 2.94088
+  dps: 1601.27169
+  tps: 1138.82724
+  dtps: 2.8249
   hps: 67.5941
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Average-Default"
  value: {
-  dps: 12583.40543
-  tps: 8837.45914
-  dtps: 2.79404
-  hps: 86.73772
+  dps: 12493.69766
+  tps: 8774.66764
+  dtps: 2.80581
+  hps: 86.74411
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-FullBuffs-p8-shockadin-1h-LongMultiTarget"
  value: {
-  dps: 17668.05385
-  tps: 12906.19566
-  dtps: 3.25868
-  hps: 86.97583
+  dps: 16284.64691
+  tps: 11935.94911
+  dtps: 3.08179
+  hps: 86.90263
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-FullBuffs-p8-shockadin-1h-LongSingleTarget"
  value: {
-  dps: 12616.48932
-  tps: 8860.49062
-  dtps: 2.8504
-  hps: 86.94737
+  dps: 12547.71638
+  tps: 8812.388
+  dtps: 2.87342
+  hps: 87.07343
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-FullBuffs-p8-shockadin-1h-ShortSingleTarget"
  value: {
-  dps: 12974.77872
-  tps: 9121.73567
-  dtps: 14.25202
-  hps: 88.31783
+  dps: 12846.32262
+  tps: 9031.85632
+  dtps: 14.3671
+  hps: 88.47033
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-NoBuffs-p8-shockadin-1h-LongMultiTarget"
  value: {
-  dps: 8666.69855
-  tps: 6557.42501
-  dtps: 2.66251
+  dps: 7996.11096
+  tps: 6087.84374
+  dtps: 2.71746
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-NoBuffs-p8-shockadin-1h-LongSingleTarget"
  value: {
-  dps: 6441.31823
-  tps: 4534.82723
-  dtps: 2.78085
+  dps: 6394.22651
+  tps: 4501.69234
+  dtps: 2.65017
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-Settings-Human-p8-shockadin-1h-p8-shockadin-1h-p8-shockadin-1h-NoBuffs-p8-shockadin-1h-ShortSingleTarget"
  value: {
-  dps: 6631.2663
-  tps: 4674.18679
-  dtps: 13.90423
+  dps: 6608.2035
+  tps: 4657.49119
+  dtps: 13.25083
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase8-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 11959.20481
-  tps: 8400.01592
-  dtps: 2.61538
-  hps: 80.11537
+  dps: 11862.73955
+  tps: 8332.4637
+  dtps: 2.6384
+  hps: 80.02387
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index c509596140..10e7dc1a56 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -1691,91 +1691,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6233.03303
-  tps: 4782.85427
+  dps: 6168.22971
+  tps: 4738.34047
   hps: 30.95547
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4527.46695
-  tps: 3056.04065
-  hps: 30.52237
+  dps: 4528.21756
+  tps: 3054.23775
+  hps: 30.52033
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4680.66967
-  tps: 3061.93408
+  dps: 4678.65156
+  tps: 3060.27774
   hps: 30.5
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2212.15557
-  tps: 1962.03447
+  dps: 2195.28968
+  tps: 1949.42872
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1668.53452
-  tps: 1137.26305
+  dps: 1669.94999
+  tps: 1138.63164
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1890.79897
-  tps: 1241.54198
+  dps: 1890.08314
+  tps: 1241.0904
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6233.03303
-  tps: 4782.85427
+  dps: 6168.22971
+  tps: 4738.34047
   hps: 30.95547
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4527.46695
-  tps: 3056.04065
-  hps: 30.52237
+  dps: 4528.21756
+  tps: 3054.23775
+  hps: 30.52033
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4680.66967
-  tps: 3061.93408
+  dps: 4678.65156
+  tps: 3060.27774
   hps: 30.5
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2211.61629
-  tps: 1961.65269
+  dps: 2195.17366
+  tps: 1949.3555
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1668.53452
-  tps: 1137.26305
+  dps: 1668.97798
+  tps: 1137.94696
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1890.79897
-  tps: 1241.54198
+  dps: 1890.08314
+  tps: 1241.0904
  }
 }
 dps_results: {
@@ -1871,91 +1871,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6286.16811
-  tps: 4815.80611
+  dps: 6207.75426
+  tps: 4761.65475
   hps: 31.5126
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4517.90936
-  tps: 3045.8504
-  hps: 31.0063
+  dps: 4510.6344
+  tps: 3040.24054
+  hps: 31.03883
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4719.93636
-  tps: 3076.7304
+  dps: 4712.46914
+  tps: 3071.11318
   hps: 31.9945
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2229.09549
-  tps: 1969.38237
+  dps: 2222.67
+  tps: 1965.31505
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1684.70966
-  tps: 1143.89066
+  dps: 1680.02434
+  tps: 1140.80408
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1956.42988
-  tps: 1282.73386
+  dps: 1957.04658
+  tps: 1283.16069
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6286.16811
-  tps: 4815.80611
+  dps: 6207.75426
+  tps: 4761.65475
   hps: 31.5126
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4517.90936
-  tps: 3045.8504
-  hps: 31.0063
+  dps: 4510.6344
+  tps: 3040.24054
+  hps: 31.03883
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4719.93636
-  tps: 3076.7304
+  dps: 4712.46914
+  tps: 3071.11318
   hps: 31.9945
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2229.49648
-  tps: 1969.57256
+  dps: 2222.30479
+  tps: 1964.97163
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1684.33411
-  tps: 1143.58863
+  dps: 1678.97326
+  tps: 1140.00492
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1956.42988
-  tps: 1282.73386
+  dps: 1957.04658
+  tps: 1283.16069
  }
 }
 dps_results: {