diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/TemporarySummon.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index a68d030b01f..031429ae4d8 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -33,7 +33,6 @@ enum PetEntry // Death Knight pets PET_GHOUL = 26125, - PET_ABOMINATION = 106848, // Shaman pet PET_SPIRIT_WOLF = 29264 @@ -115,7 +114,6 @@ class TC_GAME_API Minion : public TempSummon // Death Knight pets bool IsPetGhoul() const { return GetEntry() == PET_GHOUL; } // Ghoul may be guardian or pet - bool IsPetAbomination() const { return GetEntry() == PET_ABOMINATION; } // Sludge Belcher dk talent // Shaman pet bool IsSpiritWolf() const { return GetEntry() == PET_SPIRIT_WOLF; } // Spirit wolf from feral spirits diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index e80d629c1c4..e4f0c8d9672 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -288,7 +288,6 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c { case SUMMON_PET: petlevel = owner->GetLevel(); - SetClass(CLASS_MAGE); ReplaceAllUnitFlags(UNIT_FLAG_PLAYER_CONTROLLED); // this enables popup window (pet dismiss, cancel) break; case HUNTER_PET: @@ -921,7 +920,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) } // Power - SetPowerType(powerType); + SetPowerType(powerType, true, true); // Damage SetBonusDamage(0); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1c708a94787..ca0374e1822 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5607,13 +5607,8 @@ Powers Unit::CalculateDisplayPowerType() const if (PowerDisplayEntry const* powerDisplay = sPowerDisplayStore.LookupEntry(vehicle->GetVehicleInfo()->PowerDisplayID[0])) displayPower = Powers(powerDisplay->ActualType); } - else if (Pet const* pet = ToPet()) - { - if (pet->getPetType() == HUNTER_PET) // Hunter pets have focus - displayPower = POWER_FOCUS; - else if (pet->IsPetGhoul() || pet->IsPetAbomination()) // DK pets have energy - displayPower = POWER_ENERGY; - } + else if (IsHunterPet()) + displayPower = POWER_FOCUS; } break; } |