mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9647] Fix current pet save in summoned state.

Browse source 
Thanks to hunuza for explcit bug line pointing ;)
This commit is contained in:
VladimirMangos 2010-03-31 02:02:21 +04:00
parent f9f21b5f7f
commit 47878ab6aa
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Player.cpp
View file

@ -17033,7 +17033,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
return;
// not save secondary permanent pet as current
if (pet && m_temporaryUnsummonedPetNumber != pet->GetCharmInfo()->GetPetNumber() && mode == PET_SAVE_AS_CURRENT)
if (pet && m_temporaryUnsummonedPetNumber && m_temporaryUnsummonedPetNumber != pet->GetCharmInfo()->GetPetNumber() && mode == PET_SAVE_AS_CURRENT)
mode = PET_SAVE_NOT_IN_SLOT;
if (returnreagent && pet && mode != PET_SAVE_AS_CURRENT)
@ -17105,6 +17105,7 @@ Pet* Player::GetMiniPet()
{
if (!m_miniPet)
return NULL;
return GetMap()->GetPet(m_miniPet);
}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9646"
#define REVISION_NR "9647"
#endif // __REVISION_NR_H__