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

Core/Spells: kill unused parameter from Spell constructor

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/01d9306854618bb66f79e1f0f5d9781ff48ab019)
This commit is contained in:
hondacrx
2021-06-23 15:37:52 -04:00
parent 65173c19cb
commit b012517079
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/SpellHandler.cs
+1 -1
View File
@@ -330,7 +330,7 @@ namespace Game
if (cast.Cast.MoveUpdate.HasValue) if (cast.Cast.MoveUpdate.HasValue)
HandleMovementOpcode(ClientOpcodes.MoveStop, cast.Cast.MoveUpdate.Value); HandleMovementOpcode(ClientOpcodes.MoveStop, cast.Cast.MoveUpdate.Value);
Spell spell = new(caster, spellInfo, TriggerCastFlags.None, ObjectGuid.Empty, false); Spell spell = new(caster, spellInfo, TriggerCastFlags.None);
SpellPrepare spellPrepare = new(); SpellPrepare spellPrepare = new();
spellPrepare.ClientCastID = cast.Cast.CastID; spellPrepare.ClientCastID = cast.Cast.CastID;
Source/Game/Handlers/ToyHandler.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Game
SpellCastTargets targets = new(_player, packet.Cast); SpellCastTargets targets = new(_player, packet.Cast);
Spell spell = new(_player, spellInfo, TriggerCastFlags.None, ObjectGuid.Empty, false); Spell spell = new(_player, spellInfo, TriggerCastFlags.None);
SpellPrepare spellPrepare = new(); SpellPrepare spellPrepare = new();
spellPrepare.ClientCastID = packet.Cast.CastID; spellPrepare.ClientCastID = packet.Cast.CastID;
Source/Game/Spells/Spell.cs
+1 -8
View File
@@ -36,7 +36,7 @@ namespace Game.Spells
{ {
public partial class Spell : IDisposable public partial class Spell : IDisposable
{ {
public Spell(Unit caster, SpellInfo info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID = default, bool skipcheck = false) public Spell(Unit caster, SpellInfo info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID = default)
{ {
m_spellInfo = info; m_spellInfo = info;
m_caster = (info.HasAttribute(SpellAttr6.CastByCharmer) && caster.GetCharmerOrOwner() != null ? caster.GetCharmerOrOwner() : caster); m_caster = (info.HasAttribute(SpellAttr6.CastByCharmer) && caster.GetCharmerOrOwner() != null ? caster.GetCharmerOrOwner() : caster);
@@ -47,7 +47,6 @@ namespace Game.Spells
m_SpellVisual.SpellXSpellVisualID = caster.GetCastSpellXSpellVisualId(m_spellInfo); m_SpellVisual.SpellXSpellVisualID = caster.GetCastSpellXSpellVisualId(m_spellInfo);
m_customError = SpellCustomErrors.None; m_customError = SpellCustomErrors.None;
m_skipCheck = skipcheck;
m_fromClient = false; m_fromClient = false;
m_needComboPoints = m_spellInfo.NeedsComboPoints(); m_needComboPoints = m_spellInfo.NeedsComboPoints();
@@ -1613,11 +1612,7 @@ namespace Game.Spells
// Calculate hit result // Calculate hit result
if (m_originalCaster != null) if (m_originalCaster != null)
{
targetInfo.missCondition = m_originalCaster.SpellHitResult(target, m_spellInfo, m_canReflect && !(IsPositive() && m_caster.IsFriendlyTo(target))); targetInfo.missCondition = m_originalCaster.SpellHitResult(target, m_spellInfo, m_canReflect && !(IsPositive() && m_caster.IsFriendlyTo(target)));
if (m_skipCheck && targetInfo.missCondition != SpellMissInfo.Immune)
targetInfo.missCondition = SpellMissInfo.None;
}
else else
targetInfo.missCondition = SpellMissInfo.Evade; targetInfo.missCondition = SpellMissInfo.Evade;
@@ -7580,8 +7575,6 @@ namespace Game.Spells
// we can't store original aura link to prevent access to deleted auras // we can't store original aura link to prevent access to deleted auras
// and in same time need aura data and after aura deleting. // and in same time need aura data and after aura deleting.
public SpellInfo m_triggeredByAuraSpell; public SpellInfo m_triggeredByAuraSpell;
bool m_skipCheck;
#endregion #endregion
} }