diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-04-06 23:39:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-04-06 23:39:34 +0200 |
| commit | d20dedebd6a322e1204fa911b4a2ddc7e2c3e67a (patch) | |
| tree | 02f823f14e41a8481dc3d46f94bbca4404988e38 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 886e9e839b304b7567dd655e4fa3afb2251c96ca (diff) | |
Core/DataStores: Updated db2 structures to 7.2.0
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 09b84589716..87d97364621 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -508,7 +508,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const QuestObjective const* obj = sObjectMgr->GetQuestObjective(ConditionValue1); if (!obj) break; - + condMeets = (!player->GetQuestRewardStatus(obj->QuestID) && player->IsQuestObjectiveComplete(*obj)); } break; @@ -2590,6 +2590,19 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio if (condition->LifetimeMaxPVPRank && player->GetByteValue(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTES_OFFSET_LIFETIME_MAX_PVP_RANK) != condition->LifetimeMaxPVPRank) return false; + if (condition->MovementFlags[0] && !(player->GetUnitMovementFlags() & condition->MovementFlags[0])) + return false; + + if (condition->MovementFlags[1] && !(player->GetExtraUnitMovementFlags() & condition->MovementFlags[1])) + return false; + + if (condition->MainHandItemSubclassMask) + { + Item* mainHand = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); + if (!mainHand || !((1 << mainHand->GetTemplate()->GetSubClass()) & condition->MainHandItemSubclassMask)) + return false; + } + if (condition->PartyStatus) { Group const* group = player->GetGroup(); |