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

Core/Auras: fix static analysis issues

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/08ac27d9598d8b2708de502ed9d83a554949af93)
This commit is contained in:
hondacrx
2021-06-22 20:49:21 -04:00
parent 314607e547
commit 58f326a909
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/AuraEffect.cs
+5 -11
View File
@@ -4895,9 +4895,6 @@ namespace Game.Spells
void HandlePeriodicDamageAurasTick(Unit target, Unit caster) void HandlePeriodicDamageAurasTick(Unit target, Unit caster)
{ {
// dynobj auras must always have a caster
Cypher.Assert(GetSpellEffectInfo().Effect != SpellEffectName.PersistentAreaAura || caster != null);
if (!target.IsAlive()) if (!target.IsAlive())
return; return;
@@ -4908,6 +4905,7 @@ namespace Game.Spells
} }
// Consecrate ticks can miss and will not show up in the combat log // Consecrate ticks can miss and will not show up in the combat log
// dynobj auras must always have a caster
if (GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura && if (GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura &&
caster.SpellHitResult(target, GetSpellInfo(), false) != SpellMissInfo.None) caster.SpellHitResult(target, GetSpellInfo(), false) != SpellMissInfo.None)
return; return;
@@ -5031,9 +5029,6 @@ namespace Game.Spells
void HandlePeriodicHealthLeechAuraTick(Unit target, Unit caster) void HandlePeriodicHealthLeechAuraTick(Unit target, Unit caster)
{ {
// dynobj auras must always have a caster
Cypher.Assert(GetSpellEffectInfo().Effect != SpellEffectName.PersistentAreaAura || caster != null);
if (!target.IsAlive()) if (!target.IsAlive())
return; return;
@@ -5043,6 +5038,7 @@ namespace Game.Spells
return; return;
} }
// dynobj auras must always have a caster
if (GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura && if (GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura &&
caster.SpellHitResult(target, GetSpellInfo(), false) != SpellMissInfo.None) caster.SpellHitResult(target, GetSpellInfo(), false) != SpellMissInfo.None)
return; return;
@@ -5111,11 +5107,12 @@ namespace Game.Spells
} }
int new_damage = (int)Unit.DealDamage(caster, target, damage, cleanDamage, DamageEffectType.DOT, GetSpellInfo().GetSchoolMask(), GetSpellInfo(), false); int new_damage = (int)Unit.DealDamage(caster, target, damage, cleanDamage, DamageEffectType.DOT, GetSpellInfo().GetSchoolMask(), GetSpellInfo(), false);
Unit.ProcSkillsAndAuras(caster, target, procAttacker, procVictim, ProcFlagsSpellType.Damage, ProcFlagsSpellPhase.None, hitMask, null, damageInfo, null);
// process caster heal from now on (must be in world)
if (!caster || !caster.IsAlive()) if (!caster || !caster.IsAlive())
return; return;
Unit.ProcSkillsAndAuras(caster, target, procAttacker, procVictim, ProcFlagsSpellType.Damage, ProcFlagsSpellPhase.None, hitMask, null, damageInfo, null);
float gainMultiplier = GetSpellEffectInfo().CalcValueMultiplier(caster); float gainMultiplier = GetSpellEffectInfo().CalcValueMultiplier(caster);
uint heal = caster.SpellHealingBonusDone(caster, GetSpellInfo(), (uint)(new_damage * gainMultiplier), DamageEffectType.DOT, GetSpellEffectInfo(), stackAmountForBonuses); uint heal = caster.SpellHealingBonusDone(caster, GetSpellInfo(), (uint)(new_damage * gainMultiplier), DamageEffectType.DOT, GetSpellEffectInfo(), stackAmountForBonuses);
@@ -5162,9 +5159,6 @@ namespace Game.Spells
void HandlePeriodicHealAurasTick(Unit target, Unit caster) void HandlePeriodicHealAurasTick(Unit target, Unit caster)
{ {
// dynobj auras must always have a caster
Cypher.Assert(GetSpellEffectInfo().Effect != SpellEffectName.PersistentAreaAura || caster != null);
if (!target.IsAlive()) if (!target.IsAlive())
return; return;