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/Entities/GameObject/GameObject.cs
+2 -1
View File
@@ -727,7 +727,8 @@ namespace Game.Entities
else if (target) else if (target)
{ {
// Some traps do not have a spell but should be triggered // Some traps do not have a spell but should be triggered
CastSpellExtraArgs args = new(GetOwnerGUID()); CastSpellExtraArgs args = new();
args.SetOriginalCaster(GetOwnerGUID());
if (goInfo.Trap.spell != 0) if (goInfo.Trap.spell != 0)
CastSpell(target, goInfo.Trap.spell, args); CastSpell(target, goInfo.Trap.spell, args);
Source/Game/Entities/Player/Player.cs
+2 -2
View File
@@ -2480,7 +2480,7 @@ namespace Game.Entities
break; break;
case GossipOption.Spirithealer: case GossipOption.Spirithealer:
if (IsDead()) if (IsDead())
source.ToCreature().CastSpell(source.ToCreature(), 17251, new CastSpellExtraArgs(GetGUID())); source.ToCreature().CastSpell(source.ToCreature(), 17251, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(GetGUID()));
break; break;
case GossipOption.Questgiver: case GossipOption.Questgiver:
PrepareQuestMenu(guid); PrepareQuestMenu(guid);
@@ -3552,7 +3552,7 @@ namespace Game.Entities
SetPower(PowerType.LunarPower, 0); SetPower(PowerType.LunarPower, 0);
if (resurrectAura != 0) if (resurrectAura != 0)
CastSpell(this, resurrectAura, new CastSpellExtraArgs(resurrectGUID)); CastSpell(this, resurrectAura, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(resurrectGUID));
SpawnCorpseBones(); SpawnCorpseBones();
} }
Source/Game/Spells/Auras/Aura.cs
+1 -1
View File
@@ -1246,7 +1246,7 @@ namespace Game.Spells
if (spell < 0) if (spell < 0)
target.RemoveAurasDueToSpell((uint)-spell); target.RemoveAurasDueToSpell((uint)-spell);
else if (removeMode != AuraRemoveMode.Death) else if (removeMode != AuraRemoveMode.Death)
target.CastSpell(target, (uint)spell, new CastSpellExtraArgs(GetCasterGUID())); target.CastSpell(target, (uint)spell, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(GetCasterGUID()));
} }
} }
spellTriggered = Global.SpellMgr.GetSpellLinked((int)GetId() + (int)SpellLinkedType.Aura); spellTriggered = Global.SpellMgr.GetSpellLinked((int)GetId() + (int)SpellLinkedType.Aura);
Source/Game/Spells/Spell.cs
+2 -15
View File
@@ -2139,7 +2139,7 @@ namespace Game.Spells
if (id < 0) if (id < 0)
unit.RemoveAurasDueToSpell((uint)-id); unit.RemoveAurasDueToSpell((uint)-id);
else 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(); Pet pet = unitCaster.ToPlayer().GetPet();
if (pet != null) 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)) else if (!m_spellInfo.HasAttribute(SpellAttr1.DismissPet))
@@ -8506,19 +8506,6 @@ namespace Game.Spells
TriggeringAura = eff; 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) public CastSpellExtraArgs(Difficulty castDifficulty)
{ {
CastDifficulty = castDifficulty; CastDifficulty = castDifficulty;
Source/Game/Spells/SpellEffects.cs
+10 -7
View File
@@ -359,7 +359,8 @@ namespace Game.Spells
} }
} }
CastSpellExtraArgs args = new(m_originalCasterGUID); CastSpellExtraArgs args = new(TriggerCastFlags.FullMask);
args.SetOriginalCaster(m_originalCasterGUID);
// set basepoints for trigger with value effect // set basepoints for trigger with value effect
if (effectInfo.Effect == SpellEffectName.TriggerSpellWithValue) if (effectInfo.Effect == SpellEffectName.TriggerSpellWithValue)
for (int i = 0; i < SpellConst.MaxEffects; ++i) for (int i = 0; i < SpellConst.MaxEffects; ++i)
@@ -413,7 +414,8 @@ namespace Game.Spells
} }
} }
CastSpellExtraArgs args = new(m_originalCasterGUID); CastSpellExtraArgs args = new(TriggerCastFlags.FullMask);
args.SetOriginalCaster(m_originalCasterGUID);
// set basepoints for trigger with value effect // set basepoints for trigger with value effect
if (effectInfo.Effect == SpellEffectName.TriggerMissileSpellWithValue) if (effectInfo.Effect == SpellEffectName.TriggerMissileSpellWithValue)
for (int i = 0; i < SpellConst.MaxEffects; ++i) for (int i = 0; i < SpellConst.MaxEffects; ++i)
@@ -455,7 +457,8 @@ namespace Game.Spells
case 52463: // Hide In Mine Car case 52463: // Hide In Mine Car
case 52349: // Overtake case 52349: // Overtake
{ {
CastSpellExtraArgs args1 = new(m_originalCasterGUID); CastSpellExtraArgs args1 = new(TriggerCastFlags.FullMask);
args1.SetOriginalCaster(m_originalCasterGUID);
args1.AddSpellMod(SpellValueMod.BasePoint0, damage); args1.AddSpellMod(SpellValueMod.BasePoint0, damage);
unitTarget.CastSpell(unitTarget, spellInfo.Id, args1); unitTarget.CastSpell(unitTarget, spellInfo.Id, args1);
return; return;
@@ -466,7 +469,7 @@ namespace Game.Spells
switch (spellInfo.Id) switch (spellInfo.Id)
{ {
case 72298: // Malleable Goo Summon case 72298: // Malleable Goo Summon
unitTarget.CastSpell(unitTarget, spellInfo.Id, new CastSpellExtraArgs(m_originalCasterGUID)); unitTarget.CastSpell(unitTarget, spellInfo.Id, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(m_originalCasterGUID));
return; return;
} }
@@ -3090,7 +3093,7 @@ namespace Game.Spells
Aura chargesAura = m_caster.ToCreature().GetAura(59907); Aura chargesAura = m_caster.ToCreature().GetAura(59907);
if (chargesAura != null) if (chargesAura != null)
{ {
m_caster.CastSpell(unitTarget, spell_heal, new CastSpellExtraArgs(m_caster.ToCreature().ToTempSummon().GetSummonerGUID())); m_caster.CastSpell(unitTarget, spell_heal, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(m_caster.ToCreature().ToTempSummon().GetSummonerGUID()));
if (chargesAura.ModCharges(-1)) if (chargesAura.ModCharges(-1))
m_caster.ToCreature().ToTempSummon().UnSummon(); m_caster.ToCreature().ToTempSummon().UnSummon();
} }
@@ -3919,7 +3922,7 @@ namespace Game.Spells
unitCaster.Attack(unitTarget, true); unitCaster.Attack(unitTarget, true);
if (effectInfo.TriggerSpell != 0) if (effectInfo.TriggerSpell != 0)
m_caster.CastSpell(unitTarget, effectInfo.TriggerSpell, new CastSpellExtraArgs(m_originalCasterGUID)); m_caster.CastSpell(unitTarget, effectInfo.TriggerSpell, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(m_originalCasterGUID));
} }
} }
@@ -3947,7 +3950,7 @@ namespace Game.Spells
else if (effectHandleMode == SpellEffectHandleMode.Hit) else if (effectHandleMode == SpellEffectHandleMode.Hit)
{ {
if (effectInfo.TriggerSpell != 0) if (effectInfo.TriggerSpell != 0)
m_caster.CastSpell(destTarget, effectInfo.TriggerSpell, new CastSpellExtraArgs(m_originalCasterGUID)); m_caster.CastSpell(destTarget, effectInfo.TriggerSpell, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(m_originalCasterGUID));
} }
} }
Source/Scripts/Spells/Druid.cs
+2 -2
View File
@@ -732,7 +732,7 @@ namespace Scripts.Spells.Druid
} }
} }
target.CastSpell(target, SpellIds.LifebloomFinalHeal, new CastSpellExtraArgs(aurEff, GetCasterGUID())); target.CastSpell(target, SpellIds.LifebloomFinalHeal, new CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()));
} }
void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode) void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
@@ -955,7 +955,7 @@ namespace Scripts.Spells.Druid
void AfterApply(AuraEffect aurEff, AuraEffectHandleModes mode) void AfterApply(AuraEffect aurEff, AuraEffectHandleModes mode)
{ {
Unit target = GetTarget(); Unit target = GetTarget();
target.CastSpell(target, SpellIds.SavageRoar, new CastSpellExtraArgs(aurEff, GetCasterGUID())); target.CastSpell(target, SpellIds.SavageRoar, new CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()));
} }
void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode) void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
Source/Scripts/Spells/Generic.cs
+2 -2
View File
@@ -1673,7 +1673,7 @@ namespace Scripts.Spells.Generic
return; return;
// final heal // final heal
GetTarget().CastSpell(GetTarget(), _spellId, new CastSpellExtraArgs(aurEff, GetCasterGUID())); GetTarget().CastSpell(GetTarget(), _spellId, new CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()));
} }
public override void Register() public override void Register()
@@ -2861,7 +2861,7 @@ namespace Scripts.Spells.Generic
// on stack 15 cast the achievement crediting spell // on stack 15 cast the achievement crediting spell
if (GetStackAmount() >= 15) if (GetStackAmount() >= 15)
target.CastSpell(target, SpellIds.TurkeyVengeance, new CastSpellExtraArgs(aurEff, GetCasterGUID())); target.CastSpell(target, SpellIds.TurkeyVengeance, new CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()));
} }
void OnPeriodic(AuraEffect aurEff) void OnPeriodic(AuraEffect aurEff)
Source/Scripts/Spells/Shaman.cs
+1 -1
View File
@@ -219,7 +219,7 @@ namespace Scripts.Spells.Shaman
{ {
PreventDefaultAction(); PreventDefaultAction();
GetTarget().CastSpell(GetTarget(), SpellIds.EarthShieldHeal, new CastSpellExtraArgs(aurEff, GetCasterGUID())); GetTarget().CastSpell(GetTarget(), SpellIds.EarthShieldHeal, new CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()));
} }
public override void Register() public override void Register()