Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp
This commit is contained in:
Nay committed 2012-12-28 17:31:39 +00:00
commit 3375f56bf8
15 files changed
+182 -19

No files matched your search

+3
View File
@@ -3614,6 +3614,9 @@ void SpellMgr::LoadSpellInfoCorrections()
case 40167: // Introspection
spellInfo->Attributes |= SPELL_ATTR0_NEGATIVE_1;
break;
case 45524: // Chains of Ice
spellInfo->EffectImplicitTargetA[EFFECT_2] = 0;
break;
case 2378: // Minor Fortitude
spellInfo->ManaCost = 0;
spellInfo->ManaPerSecond = 0;