Merge branch 'master' into 310

This commit is contained in:
tomrus88 2009-06-03 16:03:44 +04:00
commit b9b2e254b5
8 changed files with 36 additions and 25 deletions

View file

@ -11459,7 +11459,7 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id)
pet->SetOwnerGUID(GetGUID());
pet->SetCreatorGUID(GetGUID());
pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction());
pet->setFaction(getFaction());
pet->SetUInt32Value(UNIT_CREATED_BY_SPELL, spell_id);
if(GetTypeId()==TYPEID_PLAYER)