diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-02 20:39:27 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-02 20:39:27 +0200 |
| commit | 6ac226f4a9e451b97ea164bfadb950992b594529 (patch) | |
| tree | 368e0a36fb90cbe28a9e0f7b4942284dec47e5c9 | |
| parent | 8caad4ba88022ec8e3d039fb594248b6589b2a6a (diff) | |
| parent | e6482508d9e7029d840828e855665a748732b9cf (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
| -rw-r--r-- | sql/updates/world/2014_09_02_00_world_misc_335.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/updates/world/2014_09_02_00_world_misc_335.sql b/sql/updates/world/2014_09_02_00_world_misc_335.sql new file mode 100644 index 00000000000..0ead7e514e6 --- /dev/null +++ b/sql/updates/world/2014_09_02_00_world_misc_335.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `faction` = 554 WHERE `entry` = 3203; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 18c529d0515..7423fd08d88 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -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 |