diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-07-02 12:17:03 +0400 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-13 00:42:20 +0100 |
| commit | 27886c7f5d6cfc221ea67aab210f96859d725e05 (patch) | |
| tree | 6502c70a3ac0b2d3cc5b80f00001e0db37f9bf2b /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 4e6c59dca78ce563c327ea3106d0ff6786b1e127 (diff) | |
Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender (#23520)
* Core/Player: add helper methods GetNativeGender/SetNativeGender/SetGender and fix some cases, where we should get player gender, instead of modified by display gender
* fix merge
* Add virtual methods for Unit class
(cherry picked from commit b47bb59e2a3e42aff3793517ef94f51678b54905)
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -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 d641f70fb6f..c0d1ac0f4a4 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -222,7 +222,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const case CONDITION_GENDER: { if (Player* player = object->ToPlayer()) - condMeets = player->GetGender() == ConditionValue1; + condMeets = player->GetNativeGender() == Gender(ConditionValue1); break; } case CONDITION_SKILL: @@ -2713,7 +2713,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio if (condition->Gender >= 0 && player->GetGender() != condition->Gender) return false; - if (condition->NativeGender >= 0 && player->GetNativeSex() != condition->NativeGender) + if (condition->NativeGender >= 0 && player->GetNativeGender() != condition->NativeGender) return false; if (condition->PowerType != -1 && condition->PowerTypeComp) |