araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-20 23:11:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

*Do not consider possessed creatures as pet. Also fix the bug that possessed creature does not display spells.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-25 22:52:08 -05:00
parent 320ac7f91e
commit d971d0121f
11 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+3 -2
View File
@@ -8341,7 +8341,7 @@ void Unit::SetMinion(Minion *minion, bool apply)
}
}
//if(minion->HasSummonMask(SUMMON_MASK_GUARDIAN))
if(minion->HasSummonMask(SUMMON_MASK_GUARDIAN))
{
if(AddUInt64Value(UNIT_FIELD_SUMMON, minion->GetGUID()))
{
@@ -8470,7 +8470,8 @@ void Unit::SetCharm(Unit* charm, bool apply)
if(!charm->RemoveUInt64Value(UNIT_FIELD_CHARMEDBY, GetGUID()))
sLog.outCrash("Unit %u is being uncharmed, but it has another charmer %u", charm->GetEntry(), charm->GetCharmerGUID());
m_Controlled.erase(charm);
if(!charm->GetOwnerGUID() == GetGUID())
m_Controlled.erase(charm);
}
}