Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Quests: Fixed quest sharing

Browse Source 
Closes #12304
Closes #16183

(cherry picked from commit 3c3cde028c)
This commit is contained in:
Shauren
2016-01-12 19:08:37 +01:00
parent a09468ea52
commit f7624e7206
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.cpp
View File

@@ -15045,13 +15045,7 @@ QuestStatus Player::GetQuestStatus(uint32 quest_id) const
bool Player::CanShareQuest(uint32 quest_id) const
{
Quest const* qInfo = sObjectMgr->GetQuestTemplate(quest_id);
if (qInfo && qInfo->HasFlag(QUEST_FLAGS_SHARABLE))
{
QuestStatusMap::const_iterator itr = m_QuestStatus.find(quest_id);
if (itr != m_QuestStatus.end())
return itr->second.Status == QUEST_STATUS_INCOMPLETE;
}
return false;
return qInfo && qInfo->HasFlag(QUEST_FLAGS_SHARABLE) && IsActiveQuest(quest_id);
}
void Player::SetQuestStatus(uint32 questId, QuestStatus status, bool update /*= true*/)

30
src/server/game/Handlers/QuestHandler.cpp
View File

@@ -98,7 +98,11 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
{
TC_LOG_DEBUG("network", "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST %s, quest = %u, startcheat = %u", packet.QuestGiverGUID.ToString().c_str(), packet.QuestID, packet.StartCheat);
Object* object = ObjectAccessor::GetObjectByTypeMask(*_player, packet.QuestGiverGUID, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT | TYPEMASK_ITEM | TYPEMASK_PLAYER);
Object* object;
if (!packet.QuestGiverGUID.IsPlayer())
object = ObjectAccessor::GetObjectByTypeMask(*_player, packet.QuestGiverGUID, TYPEMASK_UNIT | TYPEMASK_GAMEOBJECT | TYPEMASK_ITEM);
else
object = ObjectAccessor::FindPlayer(packet.QuestGiverGUID);
#define CLOSE_GOSSIP_CLEAR_DIVIDER() \
do { \
@@ -120,6 +124,11 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
CLOSE_GOSSIP_CLEAR_DIVIDER();
return;
}
if (_player->GetGroup() != playerQuestObject->GetGroup() || (_player != playerQuestObject && !playerQuestObject->GetGroup()))
{
CLOSE_GOSSIP_CLEAR_DIVIDER();
return;
}
}
else
{
@@ -132,7 +141,10 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
// some kind of WPE protection
if (!_player->CanInteractWithQuestGiver(object))
{
CLOSE_GOSSIP_CLEAR_DIVIDER();
return;
}
if (Quest const* quest = sObjectMgr->GetQuestTemplate(packet.QuestID))
{
@@ -190,7 +202,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
}
}
_player->PlayerTalkClass->SendCloseGossip();
CLOSE_GOSSIP_CLEAR_DIVIDER();
#undef CLOSE_GOSSIP_CLEAR_DIVIDER
}
@@ -605,20 +617,20 @@ void WorldSession::HandlePushQuestToParty(WorldPackets::Quest::PushQuestToParty&
else
{
receiver->SetDivider(sender->GetGUID());
receiver->PlayerTalkClass->SendQuestGiverQuestDetails(quest, sender->GetGUID(), true);
receiver->PlayerTalkClass->SendQuestGiverQuestDetails(quest, receiver->GetGUID(), true);
}
}
}
void WorldSession::HandleQuestPushResult(WorldPackets::Quest::QuestPushResult& packet)
{
if (!_player->GetDivider().IsEmpty() && _player->GetDivider() == packet.SenderGUID)
if (!_player->GetDivider().IsEmpty())
{
if (Player* player = ObjectAccessor::FindPlayer(_player->GetDivider()))
{
player->SendPushToPartyResponse(_player, static_cast<QuestPushReason>(packet.Result));
_player->SetDivider(ObjectGuid::Empty);
}
if (_player->GetDivider() == packet.SenderGUID)
if (Player* player = ObjectAccessor::FindPlayer(_player->GetDivider()))
player->SendPushToPartyResponse(_player, static_cast<QuestPushReason>(packet.Result));
_player->SetDivider(ObjectGuid::Empty);
}
}