Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
This commit is contained in:
Vincent-Michael committed 2013-09-06 21:55:19 +02:00
commit be75ddc2bd
19 files changed
+280 -225

No files matched your search

-6
View File
@@ -3050,12 +3050,6 @@ void SpellMgr::LoadSpellInfoCustomAttributes()
case 72293: // Mark of the Fallen Champion (Deathbringer Saurfang)
spellInfo->AttributesCu |= SPELL_ATTR0_CU_NEGATIVE_EFF0;
break;
case 38729: // Rod of Purification
case 51858: // Siphon of Acherus
case 96946: // Gaze of Occu'thar
case 101005: // Gaze of Occu'thar
spellInfo->AttributesCu |= SPELL_ATTR0_CU_TRIGGERED_BY_CASTER;
break;
default:
break;
}