Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Clean up summon code.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-03 10:45:34 -05:00
parent f9b13b45e0
commit f6e8ccb239
4 changed files with 33 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Unit.cpp
View File

@@ -8143,12 +8143,14 @@ Unit* Unit::GetCharm() const
void Unit::SetMinion(Minion *minion, bool apply)
{
sLog.outDebug("SetMinion %u for %u, apply %u", minion->GetEntry(), GetEntry(), apply);
if(minion->GetOwnerGUID() != GetGUID())
{
sLog.outCrash("SetMinion: Minion %u is not the minion of owner %u", minion->GetEntry(), GetEntry());
return;
}
if(apply)
{
if(!minion->SetOwner(this, true))
return;
m_Controlled.insert(minion);
// Can only have one pet. If a new one is summoned, dismiss the old one.
@@ -8204,9 +8206,6 @@ void Unit::SetMinion(Minion *minion, bool apply)
}
else
{
if(!minion->SetOwner(this, false))
return;
m_Controlled.erase(minion);
if(minion->isPet() || minion->m_Properties && minion->m_Properties->Category == SUMMON_CATEGORY_PET)