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

Core/Spells: Removed CastSpellExtraArgs constructors accepting ObjectGuid, they would become ambiguous with future changes

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3af9be830d736506ed4544a922699ed0f7a7ecd4)
This commit is contained in:
hondacrx
2021-10-03 13:12:12 -04:00
parent 3c55b9e7a8
commit e1aa4334d2
8 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+2 -15
View File
@@ -2139,7 +2139,7 @@ namespace Game.Spells
if (id < 0)
unit.RemoveAurasDueToSpell((uint)-id);
else
unit.CastSpell(unit, (uint)id, new CastSpellExtraArgs(m_caster.GetGUID()));
unit.CastSpell(unit, (uint)id, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(m_caster.GetGUID()));
}
}
}
@@ -5027,7 +5027,7 @@ namespace Game.Spells
{
Pet pet = unitCaster.ToPlayer().GetPet();
if (pet != null)
pet.CastSpell(pet, 32752, new CastSpellExtraArgs(pet.GetGUID()));
pet.CastSpell(pet, 32752, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(pet.GetGUID()));
}
}
else if (!m_spellInfo.HasAttribute(SpellAttr1.DismissPet))
@@ -8506,19 +8506,6 @@ namespace Game.Spells
TriggeringAura = eff;
}
public CastSpellExtraArgs(ObjectGuid origCaster)
{
TriggerFlags = TriggerCastFlags.FullMask;
OriginalCaster = origCaster;
}
public CastSpellExtraArgs(AuraEffect eff, ObjectGuid origCaster)
{
TriggerFlags = TriggerCastFlags.FullMask;
TriggeringAura = eff;
OriginalCaster = origCaster;
}
public CastSpellExtraArgs(Difficulty castDifficulty)
{
CastDifficulty = castDifficulty;