diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-12 00:41:56 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-07-12 00:41:56 +0200 |
| commit | 228b9329259e136bfab281127963e99ec6ff43a0 (patch) | |
| tree | 161ef67262a841f8b34f24823c4a5eddc3ec8569 /src/server/game/Entities | |
| parent | f7f7e4d0610c51434387fcd1947cac515db739a5 (diff) | |
Core/Players: Fixed power slot ordering
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 35f0b92f3f1..82a06801b80 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2414,7 +2414,7 @@ void Player::Regenerate(Powers power) // Skip regeneration for power type we cannot have uint32 powerIndex = GetPowerIndex(power); - if (powerIndex == MAX_POWERS) + if (powerIndex == MAX_POWERS || powerIndex >= MAX_POWERS_PER_CLASS) return; float addvalue = 0.0f; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3942853192d..d247e46e595 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11505,7 +11505,7 @@ void Unit::SetMaxHealth(uint32 val) int32 Unit::GetPower(Powers power) const { uint32 powerIndex = GetPowerIndex(power); - if (powerIndex == MAX_POWERS) + if (powerIndex == MAX_POWERS || powerIndex >= MAX_POWERS_PER_CLASS) return 0; return GetUInt32Value(UNIT_FIELD_POWER + powerIndex); @@ -11514,7 +11514,7 @@ int32 Unit::GetPower(Powers power) const int32 Unit::GetMaxPower(Powers power) const { uint32 powerIndex = GetPowerIndex(power); - if (powerIndex == MAX_POWERS) + if (powerIndex == MAX_POWERS || powerIndex >= MAX_POWERS_PER_CLASS) return 0; return GetInt32Value(UNIT_FIELD_MAXPOWER + powerIndex); @@ -11523,7 +11523,7 @@ int32 Unit::GetMaxPower(Powers power) const void Unit::SetPower(Powers power, int32 val) { uint32 powerIndex = GetPowerIndex(power); - if (powerIndex == MAX_POWERS) + if (powerIndex == MAX_POWERS || powerIndex >= MAX_POWERS_PER_CLASS) return; int32 maxPower = int32(GetMaxPower(power)); @@ -11557,7 +11557,7 @@ void Unit::SetPower(Powers power, int32 val) void Unit::SetMaxPower(Powers power, int32 val) { uint32 powerIndex = GetPowerIndex(power); - if (powerIndex == MAX_POWERS) + if (powerIndex == MAX_POWERS || powerIndex >= MAX_POWERS_PER_CLASS) return; int32 cur_power = GetPower(power); |