diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-03-07 03:32:32 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2018-03-07 03:34:45 -0300 |
| commit | 6e0b9a7916d158981cebe6107710141458d656cc (patch) | |
| tree | 2a44ad4e6049a7ed60b04ffbb8dd7f86d30d44a3 /src/server/scripts/Kalimdor | |
| parent | 68dde9f8c5467c5983078b190e58105f99dad75c (diff) | |
Core/Creatures: port power type updates from master branch
Core/Misc: Added helper function Unit::SetFullPower
Cherry-picked from 8199eef81cad464bb43f3613ed884a2c8fc3973d
Core/Creatures: Updated power type handling (#20981)
Cherry-picked from 16a7a414abcc93c4514905b871f53c1049261c12
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 352d16fb7a2..3d9471560d4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -176,7 +176,7 @@ class MarkTargetFilter bool operator()(WorldObject* target) const { if (Unit* unit = target->ToUnit()) - return unit->getPowerType() != POWER_MANA; + return unit->GetPowerType() != POWER_MANA; return false; } }; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index dc89f645d3d..c86432eecd3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -149,7 +149,7 @@ class boss_moam : public CreatureScript std::list<Unit*> targetList; { for (ThreatReference const* ref : me->GetThreatManager().GetUnsortedThreatList()) - if (ref->GetVictim()->GetTypeId() == TYPEID_PLAYER && ref->GetVictim()->getPowerType() == POWER_MANA) + if (ref->GetVictim()->GetTypeId() == TYPEID_PLAYER && ref->GetVictim()->GetPowerType() == POWER_MANA) targetList.push_back(ref->GetVictim()); } |