diff options
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r-- | src/game/Player.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 14565e74411..ee168c274b5 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -458,7 +458,6 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this) m_mover = this; m_seer = this; - m_miniPet = 0; m_bgAfkReportedTimer = 0; m_contestedPvPTimer = 0; @@ -1426,7 +1425,6 @@ void Player::setDeathState(DeathState s) RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); // remove uncontrolled pets - RemoveMiniPet(); RemoveGuardians(); // save value before aura remove in Unit::setDeathState @@ -1888,8 +1886,6 @@ void Player::RemoveFromWorld() ///- Release charmed creatures, unsummon totems and remove pets/guardians StopCastingCharm(); StopCastingBindSight(); - UnsummonAllTotems(); - RemoveMiniPet(); RemoveGuardians(); } @@ -17055,9 +17051,6 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) // only if current pet in slot switch(pet->getPetType()) { - case MINI_PET: - m_miniPet = 0; - break; case GUARDIAN_PET: m_guardianPets.erase(pet->GetGUID()); break; @@ -17105,22 +17098,6 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) } } -void Player::RemoveMiniPet() -{ - if(Pet* pet = GetMiniPet()) - { - pet->Remove(PET_SAVE_AS_DELETED); - m_miniPet = 0; - } -} - -Pet* Player::GetMiniPet() -{ - if(!m_miniPet) - return NULL; - return ObjectAccessor::GetPet(m_miniPet); -} - void Player::RemoveGuardians() { while(!m_guardianPets.empty()) |