mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
Merge branch 'master' into 303
Conflicts: contrib/extractor/System.cpp contrib/extractor/ad.exe src/game/WorldSocket.cpp
This commit is contained in:
commit
78ec66babc
78 changed files with 510 additions and 752 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue