diff options
| author | Meji <alvaro.megias@outlook.com> | 2023-10-13 21:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 21:09:02 +0200 |
| commit | 9f68215bb61e46265c6667b6c71f0d2376835686 (patch) | |
| tree | b4845b3c966a9a4bacaa48376cc157bc18df58ff /src/server/game/Conditions | |
| parent | 9223f0cfb472a5b5e3c6b224c618d7b22d509e47 (diff) | |
Core/Misc: Use DB2Manager::IsInArea for area-related criterias and conditions (#29359)
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 3d049d00b1b..e7d439ac7d6 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -362,7 +362,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const break; } case CONDITION_AREAID: - condMeets = object->GetAreaId() == ConditionValue1; + condMeets = DB2Manager::IsInArea(object->GetAreaId(), ConditionValue1); break; case CONDITION_SPELL: { @@ -3308,7 +3308,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio results.fill(true); for (std::size_t i = 0; i < condition->AreaID.size(); ++i) if (condition->AreaID[i]) - results[i] = player->GetAreaId() == condition->AreaID[i] || player->GetZoneId() == condition->AreaID[i]; + results[i] = DB2Manager::IsInArea(player->GetAreaId(), condition->AreaID[i]); if (!PlayerConditionLogic(condition->AreaLogic, results)) return false; |