Glyph of Blocking proc moved to DB.

--HG--
branch : trunk

sql/updates/6901_world_spell_proc_event.sql

@@ -0,0 +1,2 @@
+DELETE FROM spell_proc_event WHERE entry = 58375;
+INSERT INTO spell_proc_event VALUES(58375, 0, 4, 0, 0x200, 0, 0x10, 0, 0, 0, 0); -- Glyph of Blocking

sql/world.sql

@@ -6681,6 +6681,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 57989, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000,   0,   0,   0), -- uncommented
 ( 65661, 0x00,  15, 0x00400010, 0x20020004, 0x00000000, 0x00000010, 0x00000000,   0, 100,   0), -- uncommented
 ( 53601, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000,   0,   0,   6), -- Sacred Shield (Rank 1)
+( 58375, 0x00,   4, 0x00000000, 0x00000200, 0x00000000, 0x00000010, 0x00000000,   0,   0,   0), -- Glyph of Blocking
 ( 58387, 0x00,   4, 0x00004000, 0x00000040, 0x00000000, 0x00000010, 0x00000000,   0,   0,   0), -- Glyph of Sunder Armor
 ( 54925, 0x02,  10, 0x00000000, 0x00000208, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0); -- Glyph of Seal of Command
 /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */;

src/game/SpellEffects.cpp

@@ -431,7 +431,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 }
                 break;
             }
-
             case SPELLFAMILY_WARRIOR:
             {
                 // Bloodthirst
@@ -439,14 +438,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
                 // Shield Slam
                 else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209)
-                {
                     damage += int32(m_caster->GetShieldBlockValue());
-
-                    // Glyph of Shield Slam
-                    if (m_caster->HasAura(58375))
-                        m_caster->CastSpell(m_caster, 58374, true);
-                }
-
                 // Victory Rush
                 else if(m_spellInfo->SpellFamilyFlags[1] & 0x100)
                 {

src/game/Unit.cpp

@@ -5059,12 +5059,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     triggered_spell_id = 26654;
                     break;
                 }
-                // Glyph of Blocking
-                case 58375:
-                {
-                    triggered_spell_id = 58374;
-                    break;
-                }
                 // Unstable Power
                 case 24658:
                 {
@@ -5665,18 +5659,24 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 basepoints0 = GetShieldBlockValue() * triggerAmount / 100;
                 break;
             }
-            // Glyph of Sunder Armor
+            // Glyph of Blocking
-            if (dummySpell->Id == 58387)
+            if (dummySpell->Id == 58375)
-            {
+            {
-                if (!pVictim || !pVictim->isAlive() || !procSpell)
+                triggered_spell_id = 58374;
-                    return false;
+                break;
-
+            }
-                target = SelectNearbyTarget();
+            // Glyph of Sunder Armor
-                if (!target || target == pVictim)
+            if (dummySpell->Id == 58387)
-                    return false;
+            {
-
+                if (!pVictim || !pVictim->isAlive() || !procSpell)
-                CastSpell(target, 58567, true); 
+                    return false;
-                return true;
+
+                target = SelectNearbyTarget();
+                if (!target || target == pVictim)
+                    return false;
+
+                CastSpell(target, 58567, true); 
+                return true;
             }
             break;
         }