aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorMihapro <miha.penger@outlook.com>2018-01-03 16:39:00 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2018-01-03 16:39:32 +0100
commit8199eef81cad464bb43f3613ed884a2c8fc3973d (patch)
tree7a17cb8ede0a45814532dd306fcf7f37d2f90ce8 /src/server/game/Server
parentc2aead1da5b6cb9a3a69e276b3f12a2c76b9ab86 (diff)
Core/Misc: Added helper function Unit::SetFullPower
* Also renamed Unit::getPowerType and Unit::setPowerType to follow style guidelines Ref #20981
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/Packets/CombatLogPacketsCommon.cpp4
-rw-r--r--src/server/game/Server/Packets/PartyPackets.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
index bf7fe6374ba..6afac0117c9 100644
--- a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
+++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
@@ -27,7 +27,7 @@ void WorldPackets::Spells::SpellCastLogData::Initialize(Unit const* unit)
Health = unit->GetHealth();
AttackPower = unit->GetTotalAttackPowerValue(unit->getClass() == CLASS_HUNTER ? RANGED_ATTACK : BASE_ATTACK);
SpellPower = unit->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SPELL);
- PowerData.emplace_back(int32(unit->getPowerType()), unit->GetPower(unit->getPowerType()), int32(0));
+ PowerData.emplace_back(int32(unit->GetPowerType()), unit->GetPower(unit->GetPowerType()), int32(0));
}
void WorldPackets::Spells::SpellCastLogData::Initialize(Spell const* spell)
@@ -35,7 +35,7 @@ void WorldPackets::Spells::SpellCastLogData::Initialize(Spell const* spell)
Health = spell->GetCaster()->GetHealth();
AttackPower = spell->GetCaster()->GetTotalAttackPowerValue(spell->GetCaster()->getClass() == CLASS_HUNTER ? RANGED_ATTACK : BASE_ATTACK);
SpellPower = spell->GetCaster()->SpellBaseDamageBonusDone(SPELL_SCHOOL_MASK_SPELL);
- Powers primaryPowerType = spell->GetCaster()->getPowerType();
+ Powers primaryPowerType = spell->GetCaster()->GetPowerType();
bool primaryPowerAdded = false;
for (SpellPowerCost const& cost : spell->GetPowerCost())
{
diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp
index 6172377199a..d3d1f45995d 100644
--- a/src/server/game/Server/Packets/PartyPackets.cpp
+++ b/src/server/game/Server/Packets/PartyPackets.cpp
@@ -579,10 +579,10 @@ void WorldPackets::Party::PartyMemberState::Initialize(Player const* player)
MemberStats.MaxHealth = player->GetMaxHealth();
// Power
- MemberStats.PowerType = player->getPowerType();
+ MemberStats.PowerType = player->GetPowerType();
MemberStats.PowerDisplayID = 0;
- MemberStats.CurrentPower = player->GetPower(player->getPowerType());
- MemberStats.MaxPower = player->GetMaxPower(player->getPowerType());
+ MemberStats.CurrentPower = player->GetPower(player->GetPowerType());
+ MemberStats.MaxPower = player->GetMaxPower(player->GetPowerType());
// Position
MemberStats.ZoneID = player->GetZoneId();