Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Unit: Store charmer and charmed pointers on Unit directly, no more map lookups for Unit::GetCharmer and Unit::GetCharmed

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/a5989dcee9150565e7f4b8e3f7a62a414a484a3f)
This commit is contained in:
hondacrx
2021-11-01 11:19:47 -04:00
parent fd24603aea
commit ffb04bffc0
12 changed files with 132 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+4 -4
View File
@@ -3158,7 +3158,7 @@ namespace Game.Spells
// Unsummon summon as possessed creatures on spell cancel
if (m_spellInfo.IsChanneled() && unitCaster.IsTypeId(TypeId.Player))
{
Unit charm = unitCaster.GetCharm();
Unit charm = unitCaster.GetCharmed();
if (charm != null)
if (charm.IsTypeId(TypeId.Unit) && charm.ToCreature().HasUnitTypeMask(UnitTypeMask.Puppet)
&& charm.m_unitData.CreatedBySpell == m_spellInfo.Id)
@@ -5032,7 +5032,7 @@ namespace Game.Spells
return SpellCastResult.AlreadyHaveSummon;
goto case SummonCategory.Puppet;
case SummonCategory.Puppet:
if (!unitCaster.GetCharmGUID().IsEmpty())
if (!unitCaster.GetCharmedGUID().IsEmpty())
return SpellCastResult.AlreadyHaveCharm;
break;
}
@@ -5073,7 +5073,7 @@ namespace Game.Spells
return SpellCastResult.AlreadyHaveSummon;
}
if (!unitCaster.GetCharmGUID().IsEmpty())
if (!unitCaster.GetCharmedGUID().IsEmpty())
return SpellCastResult.AlreadyHaveCharm;
break;
}
@@ -5281,7 +5281,7 @@ namespace Game.Spells
if (!m_spellInfo.HasAttribute(SpellAttr1.DismissPet) && !unitCaster1.GetPetGUID().IsEmpty())
return SpellCastResult.AlreadyHaveSummon;
if (!unitCaster1.GetCharmGUID().IsEmpty())
if (!unitCaster1.GetCharmedGUID().IsEmpty())
return SpellCastResult.AlreadyHaveCharm;
}