diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 16:33:29 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-24 16:33:29 +0200 |
| commit | 98e27a4f15aaf6d36522755a597d89730401fdb1 (patch) | |
| tree | b9e5588449c42e21b168beb22633db10ade5fe38 /src/server/scripts/World | |
| parent | c496979e1c4826ea89d6e06b35607c35de820d20 (diff) | |
| parent | c20f92c08c2da751fd4c45d351650a8d722f0b91 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/System.cpp
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index ba17dba602a..aa289e82698 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -397,7 +397,7 @@ public: return true; } - bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) override + bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*opt*/) override { if (quest->GetQuestId() == QUEST_CLUCK) ENSURE_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset(); |