diff options
| author | Malcrom <malcromdev@gmail.com> | 2012-02-09 16:43:00 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2012-02-09 16:43:00 -0330 |
| commit | b20c0a1770872caec0f9e8069241e23df005ba60 (patch) | |
| tree | a4752d89d7bb49c133f12fd1ce66db2f9766fe2f /src/server/game/Spells/SpellMgr.cpp | |
| parent | 197b72ccb66083460dee8b542ede83c69259e096 (diff) | |
| parent | 800cf737500048a0950dcde312b35be08e1ed006 (diff) | |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellMgr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 171382ba4f7..ff4eaae42f2 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -104,9 +104,6 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellInfo const* spellproto, // Hamstring - limit duration to 10s in PvP if (spellproto->SpellFamilyFlags[0] & 0x2) return DIMINISHING_LIMITONLY; - // Improved Hamstring - else if (spellproto->AttributesEx3 & 0x80000 && spellproto->SpellIconID == 23) - return DIMINISHING_ROOT; // Charge Stun (own diminishing) else if (spellproto->SpellFamilyFlags[0] & 0x01000000) return DIMINISHING_CHARGE; @@ -2893,6 +2890,7 @@ void SpellMgr::LoadSpellCustomAttr() case 64588: // Thrust (Argent Tournament) case 66479: // Thrust (Argent Tournament) case 68505: // Thrust (Argent Tournament) + case 62709: // Counterattack! (Argent Tournament) case 62626: // Break-Shield (Argent Tournament, Player) case 64590: // Break-Shield (Argent Tournament, Player) case 64342: // Break-Shield (Argent Tournament, NPC) |