diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-22 20:06:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-22 20:06:40 +0200 |
| commit | 5bb19ce01787135bc9d1a2595ef20279e3da10e6 (patch) | |
| tree | 5e3319245e7ca3ba040b5065687f9fffaa9426ff /src/server/scripts/Commands | |
| parent | cec7c9f07e2c9ddf5382941c227c17fd08d5b903 (diff) | |
| parent | 583039c1c51ebd93975e47a1022343c626704832 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_quest.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 369a8e87289..51eea4c2c6f 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -91,13 +91,8 @@ public: // ok, normal (creature/GO starting) quest if (player->CanAddQuest(quest, true)) - { player->AddQuestAndCheckCompletion(quest, NULL); - if (player->CanCompleteQuest(entry)) - player->CompleteQuest(entry); - } - return true; } |