diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 603cf24319f..e2c9b875c7c 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -392,6 +392,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa //returning reagents for temporarily removed pets //when dying/logging out m_oldpetspell = 0; + m_lastpetnumber = 0; ////////////////////Rest System///////////////////// time_inn_enter=0; @@ -17117,7 +17118,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) return; } - if(returnreagent && (pet || m_temporaryUnsummonedPetNumber)) + if(returnreagent && (pet || m_temporaryUnsummonedPetNumber) && !InBattleGround()) { //returning of reagents only for players, so best done here uint32 spellId = pet ? pet->GetUInt32Value(UNIT_CREATED_BY_SPELL) : m_oldpetspell; |