diff options
author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
---|---|---|
committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/scripts/EasternKingdoms/duskwood.cpp | |
parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/duskwood.cpp')
-rw-r--r-- | src/server/scripts/EasternKingdoms/duskwood.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp index 145e560c946..7487ddbc548 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/duskwood.cpp @@ -34,7 +34,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { if (player->HasQuestForItem(21149)) { |