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

Core/Unit: fixed crash

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/84a29d8077d2e2b6e8c8ebcb967344b57668cb88)
This commit is contained in:
hondacrx
2021-06-22 20:17:42 -04:00
parent 063a29b9d2
commit 52276012cb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/StatSystem.cs
+2 -2
View File
@@ -741,10 +741,10 @@ namespace Game.Entities
damage -= (int)target.GetDamageReduction((uint)damage); damage -= (int)target.GetDamageReduction((uint)damage);
} }
public int CalculateAOEAvoidance(int damage, uint schoolMask, Unit caster) public int CalculateAOEAvoidance(int damage, uint schoolMask, ObjectGuid casterGuid)
{ {
damage = (int)((float)damage * GetTotalAuraMultiplierByMiscMask(AuraType.ModAoeDamageAvoidance, schoolMask)); damage = (int)((float)damage * GetTotalAuraMultiplierByMiscMask(AuraType.ModAoeDamageAvoidance, schoolMask));
if (caster.IsCreature()) if (casterGuid.IsAnyTypeCreature())
damage = (int)((float)damage * GetTotalAuraMultiplierByMiscMask(AuraType.ModCreatureAoeDamageAvoidance, schoolMask)); damage = (int)((float)damage * GetTotalAuraMultiplierByMiscMask(AuraType.ModCreatureAoeDamageAvoidance, schoolMask));
return damage; return damage;
Source/Game/Spells/Auras/AuraEffect.cs
+2 -2
View File
@@ -4990,7 +4990,7 @@ namespace Game.Spells
if (!GetSpellInfo().HasAttribute(SpellAttr4.FixedDamage)) if (!GetSpellInfo().HasAttribute(SpellAttr4.FixedDamage))
{ {
if (GetSpellEffectInfo().IsTargetingArea() || GetSpellEffectInfo().IsAreaAuraEffect() || GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura) if (GetSpellEffectInfo().IsTargetingArea() || GetSpellEffectInfo().IsAreaAuraEffect() || GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura)
damage = (uint)target.CalculateAOEAvoidance((int)damage, (uint)m_spellInfo.SchoolMask, caster); damage = (uint)target.CalculateAOEAvoidance((int)damage, (uint)m_spellInfo.SchoolMask, GetBase().GetCastItemGUID());
} }
int dmg = (int)damage; int dmg = (int)damage;
@@ -5074,7 +5074,7 @@ namespace Game.Spells
if (!GetSpellInfo().HasAttribute(SpellAttr4.FixedDamage)) if (!GetSpellInfo().HasAttribute(SpellAttr4.FixedDamage))
{ {
if (GetSpellEffectInfo().IsTargetingArea() || GetSpellEffectInfo().IsAreaAuraEffect() || GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura) if (GetSpellEffectInfo().IsTargetingArea() || GetSpellEffectInfo().IsAreaAuraEffect() || GetSpellEffectInfo().Effect == SpellEffectName.PersistentAreaAura)
damage = (uint)target.CalculateAOEAvoidance((int)damage, (uint)m_spellInfo.SchoolMask, caster); damage = (uint)target.CalculateAOEAvoidance((int)damage, (uint)m_spellInfo.SchoolMask, GetBase().GetCastItemGUID());
} }
int dmg = (int)damage; int dmg = (int)damage;
Source/Game/Spells/Spell.cs
+1 -1
View File
@@ -6865,7 +6865,7 @@ namespace Game.Spells
{ {
if (effect.IsTargetingArea() || effect.IsAreaAuraEffect() || effect.IsEffect(SpellEffectName.PersistentAreaAura)) if (effect.IsTargetingArea() || effect.IsAreaAuraEffect() || effect.IsEffect(SpellEffectName.PersistentAreaAura))
{ {
m_damage = unit.CalculateAOEAvoidance(m_damage, (uint)m_spellInfo.SchoolMask, m_caster); m_damage = unit.CalculateAOEAvoidance(m_damage, (uint)m_spellInfo.SchoolMask, m_caster.GetGUID());
if (m_caster.IsPlayer()) if (m_caster.IsPlayer())
{ {