[Fix] Glyph of Blocking

[MrLama]

What bug does the patch fix? What features does the patch add?

Effect proc of Glyph of Blocking when Shield Slam is used

UPDATE:

added Glyph of Devastate

For which repository revision was the patch created?

8994

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

---

Who has been writing this patch? Please include either forum user names or email addresses.

Me

DB part

DELETE FROM spell_proc_event WHERE entry = 58375;
INSERT INTO spell_proc_event (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
('58375', '0', '4', '0', '512', '0', '16', '0', '0', '100', '0');
DELETE FROM spell_proc_event WHERE entry = 58388;
INSERT INTO spell_proc_event (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
('58388', '0', '4', '0', '64', '0', '16', '0', '0', '100', '0');

Core part

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 5bcac41..d221882 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5452,20 +5452,32 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                break;
            }

-            // Sweeping Strikes
-            if (dummySpell->Id == 12328)
-            {
-                // prevent chain of triggered spell from same triggered spell
-                if(procSpell && procSpell->Id == 26654)
-                    return false;
-
-                target = SelectNearbyTarget(pVictim);
-                if(!target)
-                    return false;
-
-                triggered_spell_id = 26654;
-                break;
-            }
+			switch ( dummySpell->Id )
+			{
+				case 12328:	// Sweeping Strikes
+				{
+					// prevent chain of triggered spell from same triggered spell
+					if(procSpell && procSpell->Id == 26654)
+						return false;
+
+					target = SelectNearbyTarget(pVictim);
+					if(!target)
+						return false;
+
+					triggered_spell_id = 26654;
+					break;
+				}
+				case 58375:	// Glyph of Blocking
+				{
+					triggered_spell_id = 58374;
+					break;
+				}
+				case 58388:	// Glyph of Devastate
+				{
+					triggered_spell_id = 58567;
+					break;
+				}
+			}
            break;
        }
        case SPELLFAMILY_WARLOCK:

[ascent]

anyone review?

[przemratajczak]

both patches are working as intended