diff options
| author | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
| commit | 774f3cdc9b2861f0ba2bf496a8528e41f0f578c3 (patch) | |
| tree | 8de17fe0abd756fdd42515d175d1b40b638a0357 /src/server/game/Handlers/QuestHandler.cpp | |
| parent | f40e0d0a9a9e5b43379772f84ea92ea84cedc7d4 (diff) | |
Fixed some merging errors, there could be more, but at least it compiles.
Diffstat (limited to 'src/server/game/Handlers/QuestHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/QuestHandler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 62372004f03..ccd2e178f88 100755 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -490,8 +490,6 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data) Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, playerGuid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); if (!object || !object->hasInvolvedQuest(questId)) - Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, guid, TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT); - if (!object || !object->hasInvolvedQuest(questId)) return; // some kind of WPE protection |