diff options
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index a053e694bd1..7df230526dc 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -855,7 +855,10 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) if (petType == HUNTER_PET) // Hunter pets have focus SetPowerType(POWER_FOCUS); else if (IsPetGhoul() || IsPetAbomination()) // DK pets have energy + { SetPowerType(POWER_ENERGY); + SetFullPower(POWER_ENERGY); + } else if (IsPetImp() || IsPetFelhunter() || IsPetVoidwalker() || IsPetSuccubus() || IsPetDoomguard() || IsPetFelguard()) // Warlock pets have energy (since 5.x) SetPowerType(POWER_ENERGY); else diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 848a2eb5007..3b8b22c21c4 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -74,13 +74,7 @@ Vehicle::~Vehicle() void Vehicle::Install() { - if (_me->GetTypeId() == TYPEID_UNIT) - { - if (PowerDisplayEntry const* powerDisplay = sPowerDisplayStore.LookupEntry(_vehicleInfo->PowerDisplayID[0])) - _me->SetPowerType(Powers(powerDisplay->ActualType)); - else if (_me->getClass() == CLASS_ROGUE) - _me->SetPowerType(POWER_ENERGY); - } + _me->UpdateDisplayPower(); _status = STATUS_INSTALLED; if (GetBase()->GetTypeId() == TYPEID_UNIT) |