diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
| commit | f7aedaef3303b38d2e54faaad6ff80b66aaea074 (patch) | |
| tree | 8f5df9c7482adafded212bee31ae68e91dbe1840 /src/server/game/Spells/SpellEffects.cpp | |
| parent | 506ddbbf40d588840cd8eee810761b6a5ed44973 (diff) | |
| parent | dcfbe53552b0a242a88a068a6e3e7f4c863f2ffb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 621c4e2bce0..33bfc042889 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5308,12 +5308,8 @@ void Spell::EffectQuestStart(SpellEffIndex effIndex) Player* player = unitTarget->ToPlayer(); if (Quest const* qInfo = sObjectMgr->GetQuestTemplate(m_spellInfo->Effects[effIndex].MiscValue)) - { if (player->CanTakeQuest(qInfo, false) && player->CanAddQuest(qInfo, false)) - { - player->AddQuest(qInfo, NULL); - } - } + player->AddQuestAndCheckCompletion(qInfo, NULL); } void Spell::EffectActivateRune(SpellEffIndex effIndex) |