diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-21 16:34:52 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-21 16:35:36 +0200 |
| commit | 0ab9f938adefd1c9024d9cf06d875e3f31ba7815 (patch) | |
| tree | 8f93340bf00b08ddc1ce20fc67c880b7c15b4611 | |
| parent | d1618d2422b377244d861c14d0757d23aef9d37a (diff) | |
| parent | e3e342b0f79cfb9e88fbb9aba124c6f8c611eb1b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
| -rw-r--r-- | sql/updates/world/2014_04_21_00_world_smart_scripts.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2014_04_21_01_world_quest_template.sql | 8 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sql/updates/world/2014_04_21_00_world_smart_scripts.sql b/sql/updates/world/2014_04_21_00_world_smart_scripts.sql new file mode 100644 index 00000000000..4f69ae50bef --- /dev/null +++ b/sql/updates/world/2014_04_21_00_world_smart_scripts.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=4856 AND `id`=9; diff --git a/sql/updates/world/2014_04_21_01_world_quest_template.sql b/sql/updates/world/2014_04_21_01_world_quest_template.sql new file mode 100644 index 00000000000..4fe092577e0 --- /dev/null +++ b/sql/updates/world/2014_04_21_01_world_quest_template.sql @@ -0,0 +1,8 @@ +-- +UPDATE `quest_template` SET `prevquestid`=25229 WHERE `id`=25199; +UPDATE `quest_template` SET `prevquestid`=25199 WHERE `id`=25285; +UPDATE `quest_template` SET `prevquestid`=25285 WHERE `id`=25289; +UPDATE `quest_template` SET `prevquestid`=25289 WHERE `id`=25295; +UPDATE `quest_template` SET `prevquestid`=25199 WHERE `id`=25212; +UPDATE `quest_template` SET `prevquestid`=25295 WHERE `id`=25283; +UPDATE `quest_template` SET `prevquestid`=25283 WHERE `id`=25500; diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 20448e79fb7..fdc76f5fa95 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -1169,7 +1169,7 @@ class RaidCheck Unit const* _caster; }; -// -48438 - Wild Growth +// 48438 - Wild Growth class spell_dru_wild_growth : public SpellScriptLoader { public: |