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

This commit is contained in:
Vincent-Michael committed 2014-09-02 20:39:27 +02:00
commit 6ac226f4a9
2 files changed
+5

No files matched your search

@@ -0,0 +1,2 @@
--
UPDATE `creature_template` SET `faction` = 554 WHERE `entry` = 3203;
+3
View File
@@ -85,6 +85,9 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellInfo const* spellproto,
// Black Plague
else if (spellproto->Id == 64155)
return DIMINISHING_NONE;
// Screams of the Dead (King Ymiron)
else if (spellproto->Id == 51750)
return DIMINISHING_NONE;
break;
}
// Event spells