Merge branch 'master' into 303

Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2008-11-06 15:50:47 +03:00
commit 78ec66babc
78 changed files with 510 additions and 752 deletions

View file

@ -449,7 +449,6 @@ void Pet::SavePetToDB(PetSaveMode mode)
case PET_SAVE_AS_DELETED:
{
RemoveAllAuras();
uint32 owner = GUID_LOPART(GetOwnerGUID());
DeleteFromDB(m_charmInfo->GetPetNumber());
break;
}