diff options
| author | Lopin <davca.hr@seznam.cz> | 2011-06-18 21:48:33 +0200 |
|---|---|---|
| committer | Lopin <davca.hr@seznam.cz> | 2011-06-18 21:48:33 +0200 |
| commit | 054d6ae3fc7fcb8c91075d43775415b186c296a9 (patch) | |
| tree | 9167f6f0c234f453f2bece612adea5435c39e338 | |
| parent | 65c5e8b0a8ce994c36da04554cc55ce76867acd7 (diff) | |
| parent | 89c97b94fd3e71dd45af9a0fe6aace202c1d72ef (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
| -rwxr-xr-x | src/server/game/Spells/SpellMgr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 9c96411e2ec..7f0b50f4d2e 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2862,9 +2862,13 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto } case SPELLFAMILY_PALADIN: { + // Judgement of Justice - limit duration to 10s in PvP + if (spellproto->SpellFamilyFlags[0] & 0x100000) + return DIMINISHING_LIMITONLY; // Turn Evil - if ((spellproto->SpellFamilyFlags[1] & 0x804000) && spellproto->SpellIconID == 309) + else if ((spellproto->SpellFamilyFlags[1] & 0x804000) && spellproto->SpellIconID == 309) return DIMINISHING_FEAR; + break; } case SPELLFAMILY_PRIEST: { |