Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
Conflicts: .travis.yml cmake/macros/ConfigureBoost.cmake sql/base/auth_database.sql sql/base/characters_database.sql sql/base/dev/world_database.sql sql/updates/world/2015_03_21_00_world.sql src/server/game/Miscellaneous/Language.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Spells/spell_quest.cpp src/server/worldserver/Main.cpp
This commit is contained in:
commit
fd0ef7bfab
402 files changed
+2494
-366
No files matched your search
@@ -2293,7 +2293,7 @@ void SpellMgr::LoadEnchantCustomAttr()
|
||||
continue;
|
||||
|
||||
/// @todo find a better check
|
||||
if (!(spellInfo->AttributesEx2 & SPELL_ATTR2_PRESERVE_ENCHANT_IN_ARENA) || !(spellInfo->Attributes & SPELL_ATTR0_NOT_SHAPESHIFT))
|
||||
if (!spellInfo->HasAttribute(SPELL_ATTR2_PRESERVE_ENCHANT_IN_ARENA) || !spellInfo->HasAttribute(SPELL_ATTR0_NOT_SHAPESHIFT))
|
||||
continue;
|
||||
|
||||
for (uint32 j = 0; j < MAX_SPELL_EFFECTS; ++j)
|
||||
@@ -3768,7 +3768,7 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
{
|
||||
case SPELLFAMILY_PALADIN:
|
||||
// Seals of the Pure should affect Seal of Righteousness
|
||||
if (spellInfo->SpellIconID == 25 && spellInfo->Attributes & SPELL_ATTR0_PASSIVE)
|
||||
if (spellInfo->SpellIconID == 25 && spellInfo->HasAttribute(SPELL_ATTR0_PASSIVE))
|
||||
spellInfo->Effects[EFFECT_0].SpellClassMask[1] |= 0x20000000;
|
||||
break;
|
||||
case SPELLFAMILY_DEATHKNIGHT:
|
||||
|
||||
Reference in new issue
Block a user