Merge commit 'origin/master' into 310

This commit is contained in:
VladimirMangos 2009-05-23 01:55:33 +04:00
commit f72a8bc6dc
21 changed files with 161 additions and 62 deletions

View file

@ -211,6 +211,9 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
sLog.outError("Pet have incorrect type (%u) for pet loading.", getPetType());
}
if(owner->IsPvP())
SetPvP(true);
InitStatsForLevel(petlevel);
SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32());