diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-03-07 04:19:06 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-08-23 19:29:41 +0200 |
| commit | e8e501609fd6e8b4b0affd8d91077d36e7161a89 (patch) | |
| tree | 8dd83bbd559afbb18283d3d70c727e28658954bb /src | |
| parent | 9f0204b3571f9ec83a21f676d4e0682d0fb30c58 (diff) | |
Core/Entities: ghouls start with full energy
(cherry picked from commit 0c1e485e13d065b26e24b4226044246ae8ca0e4d)
Diffstat (limited to 'src')
3 files changed, 5 insertions, 8 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) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 658d4bb80a6..14d1c985e8c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -1820,7 +1820,7 @@ class npc_toc_rogue : public CreatureScript events.ScheduleEvent(EVENT_WOUND_POISON, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); SetEquipmentSlots(false, 47422, 49982, EQUIP_NO_CHANGE); me->SetPowerType(POWER_ENERGY); - me->SetMaxPower(POWER_ENERGY, 100); + me->SetFullPower(POWER_ENERGY); } void UpdateAI(uint32 diff) override |