mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
[9927] Support new raid allowed quest types.
This commit is contained in:
parent
611b53fab8
commit
d5c7e7b7d2
4 changed files with 6 additions and 6 deletions
|
|
@ -14271,7 +14271,7 @@ void Player::KilledMonsterCredit( uint32 entry, ObjectGuid guid )
|
|||
continue;
|
||||
// just if !ingroup || !noraidgroup || raidgroup
|
||||
QuestStatusData& q_status = mQuestStatus[questid];
|
||||
if( q_status.m_status == QUEST_STATUS_INCOMPLETE && (!GetGroup() || !GetGroup()->isRaidGroup() || qInfo->GetType() == QUEST_TYPE_RAID))
|
||||
if( q_status.m_status == QUEST_STATUS_INCOMPLETE && (!GetGroup() || !GetGroup()->isRaidGroup() || qInfo->IsAllowedInRaid())
|
||||
{
|
||||
if( qInfo->HasFlag( QUEST_MANGOS_FLAGS_KILL_OR_CAST) )
|
||||
{
|
||||
|
|
@ -14514,8 +14514,7 @@ bool Player::HasQuestForItem( uint32 itemid ) const
|
|||
continue;
|
||||
|
||||
// hide quest if player is in raid-group and quest is no raid quest
|
||||
if (GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID
|
||||
&& !InBattleGround())
|
||||
if (GetGroup() && GetGroup()->isRaidGroup() && qinfo->IsAllowedInRaid() && !InBattleGround())
|
||||
continue;
|
||||
|
||||
// There should be no mixed ReqItem/ReqSource drop
|
||||
|
|
@ -19805,7 +19804,7 @@ bool Player::HasQuestForGO(int32 GOId) const
|
|||
if(!qinfo)
|
||||
continue;
|
||||
|
||||
if(GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID)
|
||||
if(GetGroup() && GetGroup()->isRaidGroup() && qinfo->IsAllowedInRaid())
|
||||
continue;
|
||||
|
||||
for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue