Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Try to fix crash.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-31 09:18:39 -06:00
parent be89c6bb2a
commit 031df598ab
14 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Unit.cpp
View File

@@ -11313,11 +11313,6 @@ uint32 Unit::GetCreatePowers( Powers power ) const
return 0;
}
void Unit::AddToWorld()
{
WorldObject::AddToWorld();
}
void Unit::RemoveFromWorld()
{
// cleanup
@@ -11338,7 +11333,7 @@ void Unit::RemoveFromWorld()
void Unit::CleanupsBeforeDelete()
{
if(m_uint32Values) // only for fully created object
if(IsInWorld()) // only for fully created object
{
RemoveAllAuras();
InterruptNonMeleeSpells(true);
@@ -11350,8 +11345,9 @@ void Unit::CleanupsBeforeDelete()
RemoveAllGameObjects();
RemoveAllDynObjects();
GetMotionMaster()->Clear(false); // remove different non-standard movement generators.
RemoveFromWorld();
}
RemoveFromWorld();
}
void Unit::UpdateCharmAI()
@@ -12540,7 +12536,6 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id)
pet->GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
// this enables pet details window (Shift+P)
pet->AIM_Initialize();
pet->InitPetCreateSpells();
pet->InitTalentForLevel();
pet->SetHealth(pet->GetMaxHealth());