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

Core/Aura: Fixes a crash in _InitEffects.

Browse Source
This commit is contained in:
hondacrx
2021-01-14 11:12:07 -05:00
parent 16c72839a7
commit c5e3c4280c
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/Aura.cs
+1 -1
View File
@@ -342,7 +342,7 @@ namespace Game.Spells
public void _InitEffects(uint effMask, Unit caster, int[] baseAmount) public void _InitEffects(uint effMask, Unit caster, int[] baseAmount)
{ {
// shouldn't be in constructor - functions in AuraEffect.AuraEffect use polymorphism // shouldn't be in constructor - functions in AuraEffect.AuraEffect use polymorphism
_effects = new AuraEffect[GetSpellInfo().GetEffects().Count]; _effects = new AuraEffect[SpellConst.MaxEffects];
foreach (SpellEffectInfo effect in GetSpellInfo().GetEffects()) foreach (SpellEffectInfo effect in GetSpellInfo().GetEffects())
{ {
Source/Game/Spells/SpellInfo.cs
+37 -38
View File
@@ -237,7 +237,7 @@ namespace Game.Spells
public bool HasEffect(SpellEffectName effect) public bool HasEffect(SpellEffectName effect)
{ {
foreach (SpellEffectInfo eff in _effects.Values) foreach (SpellEffectInfo eff in _effects)
if (eff != null && eff.IsEffect(effect)) if (eff != null && eff.IsEffect(effect))
return true; return true;
@@ -246,7 +246,7 @@ namespace Game.Spells
public bool HasAura(AuraType aura) public bool HasAura(AuraType aura)
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.IsAura(aura)) if (effect != null && effect.IsAura(aura))
return true; return true;
@@ -255,7 +255,7 @@ namespace Game.Spells
public bool HasAreaAuraEffect() public bool HasAreaAuraEffect()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.IsAreaAuraEffect()) if (effect != null && effect.IsAreaAuraEffect())
return true; return true;
@@ -264,7 +264,7 @@ namespace Game.Spells
public bool HasOnlyDamageEffects() public bool HasOnlyDamageEffects()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null) if (effect == null)
continue; continue;
@@ -313,7 +313,7 @@ namespace Game.Spells
public bool IsProfession() public bool IsProfession()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && effect.Effect == SpellEffectName.Skill) if (effect != null && effect.Effect == SpellEffectName.Skill)
{ {
@@ -328,7 +328,7 @@ namespace Game.Spells
public bool IsPrimaryProfession() public bool IsPrimaryProfession()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.Effect == SpellEffectName.Skill) if (effect != null && effect.Effect == SpellEffectName.Skill)
if (Global.SpellMgr.IsPrimaryProfessionSkill((uint)effect.MiscValue)) if (Global.SpellMgr.IsPrimaryProfessionSkill((uint)effect.MiscValue))
return true; return true;
@@ -354,7 +354,7 @@ namespace Game.Spells
public bool IsAffectingArea() public bool IsAffectingArea()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.IsEffect() && (effect.IsTargetingArea() || effect.IsEffect(SpellEffectName.PersistentAreaAura) || effect.IsAreaAuraEffect())) if (effect != null && effect.IsEffect() && (effect.IsTargetingArea() || effect.IsEffect(SpellEffectName.PersistentAreaAura) || effect.IsAreaAuraEffect()))
return true; return true;
@@ -364,7 +364,7 @@ namespace Game.Spells
// checks if spell targets are selected from area, doesn't include spell effects in check (like area wide auras for example) // checks if spell targets are selected from area, doesn't include spell effects in check (like area wide auras for example)
public bool IsTargetingArea() public bool IsTargetingArea()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.IsEffect() && effect.IsTargetingArea()) if (effect != null && effect.IsEffect() && effect.IsTargetingArea())
return true; return true;
@@ -384,7 +384,7 @@ namespace Game.Spells
if (triggeringSpell.IsChanneled()) if (triggeringSpell.IsChanneled())
{ {
SpellCastTargetFlags mask = 0; SpellCastTargetFlags mask = 0;
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && (effect.TargetA.GetTarget() != Targets.UnitCaster && effect.TargetA.GetTarget() != Targets.DestCaster if (effect != null && (effect.TargetA.GetTarget() != Targets.UnitCaster && effect.TargetA.GetTarget() != Targets.DestCaster
&& effect.TargetB.GetTarget() != Targets.UnitCaster && effect.TargetB.GetTarget() != Targets.DestCaster)) && effect.TargetB.GetTarget() != Targets.UnitCaster && effect.TargetB.GetTarget() != Targets.DestCaster))
@@ -420,7 +420,7 @@ namespace Game.Spells
return false; return false;
// All stance spells. if any better way, change it. // All stance spells. if any better way, change it.
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null) if (effect == null)
continue; continue;
@@ -486,7 +486,7 @@ namespace Game.Spells
public bool IsGroupBuff() public bool IsGroupBuff()
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null) if (effect == null)
continue; continue;
@@ -940,7 +940,7 @@ namespace Game.Spells
// aura limitations // aura limitations
if (player) if (player)
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null || !effect.IsAura()) if (effect == null || !effect.IsAura())
continue; continue;
@@ -1181,7 +1181,7 @@ namespace Game.Spells
if (vehicle) if (vehicle)
{ {
VehicleSeatFlags checkMask = 0; VehicleSeatFlags checkMask = 0;
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && effect.ApplyAuraName == AuraType.ModShapeshift) if (effect != null && effect.ApplyAuraName == AuraType.ModShapeshift)
{ {
@@ -1206,7 +1206,7 @@ namespace Game.Spells
// Can only summon uncontrolled minions/guardians when on controlled vehicle // Can only summon uncontrolled minions/guardians when on controlled vehicle
if (vehicleSeat.HasSeatFlag(VehicleSeatFlags.CanControl | VehicleSeatFlags.Unk2)) if (vehicleSeat.HasSeatFlag(VehicleSeatFlags.CanControl | VehicleSeatFlags.Unk2))
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null || effect.Effect != SpellEffectName.Summon) if (effect == null || effect.Effect != SpellEffectName.Summon)
continue; continue;
@@ -1253,7 +1253,7 @@ namespace Game.Spells
if (Mechanic != 0) if (Mechanic != 0)
mask |= (uint)(1 << (int)Mechanic); mask |= (uint)(1 << (int)Mechanic);
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && effect.IsEffect() && effect.Mechanic != 0) if (effect != null && effect.IsEffect() && effect.Mechanic != 0)
mask |= 1u << (int)effect.Mechanic; mask |= 1u << (int)effect.Mechanic;
@@ -1266,7 +1266,7 @@ namespace Game.Spells
if (Mechanic != 0) if (Mechanic != 0)
mask |= (uint)(1 << (int)Mechanic); mask |= (uint)(1 << (int)Mechanic);
var effect = _effects.LookupByKey(effIndex); var effect = _effects[effIndex];
if (effect != null && effect.IsEffect() && effect.Mechanic != 0) if (effect != null && effect.IsEffect() && effect.Mechanic != 0)
mask |= 1u << (int)effect.Mechanic; mask |= 1u << (int)effect.Mechanic;
@@ -1279,7 +1279,7 @@ namespace Game.Spells
if (Mechanic != 0) if (Mechanic != 0)
mask |= (uint)(1 << (int)Mechanic); mask |= (uint)(1 << (int)Mechanic);
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && Convert.ToBoolean(effectMask & (1 << (int)effect.EffectIndex)) && effect.Mechanic != 0) if (effect != null && Convert.ToBoolean(effectMask & (1 << (int)effect.EffectIndex)) && effect.Mechanic != 0)
mask |= 1u << (int)effect.Mechanic; mask |= 1u << (int)effect.Mechanic;
@@ -1368,7 +1368,7 @@ namespace Game.Spells
if (Convert.ToBoolean(GetSchoolMask() & SpellSchoolMask.Frost)) if (Convert.ToBoolean(GetSchoolMask() & SpellSchoolMask.Frost))
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && (effect.IsAura(AuraType.ModStun) || effect.IsAura(AuraType.ModRoot))) if (effect != null && (effect.IsAura(AuraType.ModStun) || effect.IsAura(AuraType.ModRoot)))
_auraState = AuraStateType.Frozen; _auraState = AuraStateType.Frozen;
} }
@@ -1410,7 +1410,7 @@ namespace Game.Spells
{ {
bool food = false; bool food = false;
bool drink = false; bool drink = false;
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null || !effect.IsAura()) if (effect == null || !effect.IsAura())
continue; continue;
@@ -1552,7 +1552,7 @@ namespace Game.Spells
break; break;
} }
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && effect.Effect == SpellEffectName.ApplyAura) if (effect != null && effect.Effect == SpellEffectName.ApplyAura)
{ {
@@ -2297,7 +2297,7 @@ namespace Game.Spells
_allowedMechanicMask |= immuneInfo.MechanicImmuneMask; _allowedMechanicMask |= immuneInfo.MechanicImmuneMask;
}); });
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null) if (effect == null)
continue; continue;
@@ -2415,7 +2415,7 @@ namespace Game.Spells
if (auraSpellInfo == null) if (auraSpellInfo == null)
return false; return false;
foreach (SpellEffectInfo effectInfo in _effects.Values) foreach (SpellEffectInfo effectInfo in _effects)
{ {
if (effectInfo == null) if (effectInfo == null)
continue; continue;
@@ -2507,7 +2507,7 @@ namespace Game.Spells
if (aurEff.GetSpellInfo().HasAttribute(SpellAttr0.UnaffectedByInvulnerability)) if (aurEff.GetSpellInfo().HasAttribute(SpellAttr0.UnaffectedByInvulnerability))
return false; return false;
foreach (SpellEffectInfo effectInfo in _effects.Values) foreach (SpellEffectInfo effectInfo in _effects)
{ {
if (effectInfo == null) if (effectInfo == null)
continue; continue;
@@ -2628,7 +2628,7 @@ namespace Game.Spells
if (DotDuration == 0) if (DotDuration == 0)
return 1; return 1;
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && effect.Effect == SpellEffectName.ApplyAura) if (effect != null && effect.Effect == SpellEffectName.ApplyAura)
{ {
@@ -3040,7 +3040,7 @@ namespace Game.Spells
return this; return this;
bool needRankSelection = false; bool needRankSelection = false;
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect != null && IsPositiveEffect(effect.EffectIndex) && if (effect != null && IsPositiveEffect(effect.EffectIndex) &&
(effect.Effect == SpellEffectName.ApplyAura || (effect.Effect == SpellEffectName.ApplyAura ||
@@ -3126,7 +3126,7 @@ namespace Game.Spells
bool dstSet = false; bool dstSet = false;
SpellCastTargetFlags targetMask = targets; SpellCastTargetFlags targetMask = targets;
// prepare target mask using effect target entries // prepare target mask using effect target entries
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
{ {
if (effect == null || !effect.IsEffect()) if (effect == null || !effect.IsEffect())
continue; continue;
@@ -3204,7 +3204,7 @@ namespace Game.Spells
return true; return true;
// Special case: effects which determine positivity of whole spell // Special case: effects which determine positivity of whole spell
foreach (SpellEffectInfo effectInfo in _effects.Values) foreach (SpellEffectInfo effectInfo in _effects)
if (effectInfo != null && effectInfo.IsAura() && effectInfo.ApplyAuraName == AuraType.ModStealth) if (effectInfo != null && effectInfo.IsAura() && effectInfo.ApplyAuraName == AuraType.ModStealth)
return true; return true;
@@ -3267,7 +3267,7 @@ namespace Game.Spells
if (spellTriggeredProto != null) if (spellTriggeredProto != null)
{ {
// negative targets of main spell return early // negative targets of main spell return early
foreach (SpellEffectInfo eff in spellTriggeredProto._effects.Values) foreach (SpellEffectInfo eff in spellTriggeredProto._effects)
{ {
if (eff == null || eff.Effect == 0) if (eff == null || eff.Effect == 0)
continue; continue;
@@ -3284,7 +3284,7 @@ namespace Game.Spells
break; break;
case AuraType.ModStun: //have positive and negative spells, we can't sort its correctly at this moment. case AuraType.ModStun: //have positive and negative spells, we can't sort its correctly at this moment.
bool more = false; bool more = false;
foreach (SpellEffectInfo eff in _effects.Values) foreach (SpellEffectInfo eff in _effects)
{ {
if (eff != null && eff.EffectIndex != 0) if (eff != null && eff.EffectIndex != 0)
{ {
@@ -3424,19 +3424,18 @@ namespace Game.Spells
public void _UnloadImplicitTargetConditionLists() public void _UnloadImplicitTargetConditionLists()
{ {
// find the same instances of ConditionList and delete them. // find the same instances of ConditionList and delete them.
var effectList = _effects.Values.ToList(); for (int i = 0; i < _effects.Length; ++i)
for (int i = 0; i < effectList.Count; ++i)
{ {
SpellEffectInfo effect = effectList[i]; SpellEffectInfo effect = _effects[i];
if (effect != null) if (effect != null)
{ {
var cur = effect.ImplicitTargetConditions; var cur = effect.ImplicitTargetConditions;
if (cur == null) if (cur == null)
continue; continue;
for (var j = i; j < effectList.Count; ++j) for (var j = i; j < _effects.Length; ++j)
{ {
SpellEffectInfo eff = effectList[j]; SpellEffectInfo eff = _effects[j];
if (eff != null && eff.ImplicitTargetConditions == cur) if (eff != null && eff.ImplicitTargetConditions == cur)
eff.ImplicitTargetConditions = null; eff.ImplicitTargetConditions = null;
} }
@@ -3478,13 +3477,13 @@ namespace Game.Spells
return CategoryId; return CategoryId;
} }
public ICollection<SpellEffectInfo> GetEffects() { return _effects.Values; } public SpellEffectInfo[] GetEffects() { return _effects; }
public SpellEffectInfo GetEffect(uint index) { return _effects.LookupByKey(index); } public SpellEffectInfo GetEffect(uint index) { return _effects[index]; }
public bool HasTargetType(Targets target) public bool HasTargetType(Targets target)
{ {
foreach (SpellEffectInfo effect in _effects.Values) foreach (SpellEffectInfo effect in _effects)
if (effect != null && (effect.TargetA.GetTarget() == target || effect.TargetB.GetTarget() == target)) if (effect != null && (effect.TargetA.GetTarget() == target || effect.TargetB.GetTarget() == target))
return true; return true;
@@ -3603,7 +3602,7 @@ namespace Game.Spells
public uint ExplicitTargetMask { get; set; } public uint ExplicitTargetMask { get; set; }
public SpellChainNode ChainEntry { get; set; } public SpellChainNode ChainEntry { get; set; }
Dictionary<uint, SpellEffectInfo> _effects = new Dictionary<uint, SpellEffectInfo>(); SpellEffectInfo[] _effects = new SpellEffectInfo[SpellConst.MaxEffects];
List<SpellXSpellVisualRecord> _visuals = new List<SpellXSpellVisualRecord>(); List<SpellXSpellVisualRecord> _visuals = new List<SpellXSpellVisualRecord>();
SpellSpecificType _spellSpecific; SpellSpecificType _spellSpecific;
AuraStateType _auraState; AuraStateType _auraState;