--HG--
branch : trunk
This commit is contained in:
Muhaha
2009-10-06 22:41:37 +02:00
parent dd84dfd56d
commit f162303eae
5 changed files with 46 additions and 1 deletions
+2 -1
View File
@@ -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;