From 03cc39b4a21656c6361faaebf8ce17d0e91bf9d5 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 30 Mar 2021 11:14:16 -0400 Subject: [PATCH] Fixed two crashes --- Source/Game/Entities/Unit/Unit.Combat.cs | 2 +- Source/Game/Entities/Unit/Unit.Spells.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 4db2b115e..f0134153b 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -330,7 +330,7 @@ namespace Game.Entities public virtual void OnCombatExit() { - foreach (var pair in m_appliedAuras) + foreach (var pair in m_appliedAuras.KeyValueList) { AuraApplication aurApp = pair.Value; aurApp.GetBase().CallScriptEnterLeaveCombatHandlers(aurApp, false); diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs index 06bed5a05..7a9b008bb 100644 --- a/Source/Game/Entities/Unit/Unit.Spells.cs +++ b/Source/Game/Entities/Unit/Unit.Spells.cs @@ -654,7 +654,7 @@ namespace Game.Entities public float GetUnitSpellCriticalChance(Unit victim, Spell spell, AuraEffect aurEff, SpellSchoolMask schoolMask, WeaponAttackType attackType = WeaponAttackType.BaseAttack) { - SpellInfo spellProto = spell.GetSpellInfo() ?? aurEff.GetSpellInfo(); + SpellInfo spellProto = spell?.GetSpellInfo() ?? aurEff?.GetSpellInfo(); //! Mobs can't crit with spells. Player Totems can //! Fire Elemental (from totem) can too - but this part is a hack and needs more research if (GetGUID().IsCreatureOrVehicle() && !(IsTotem() && GetOwnerGUID().IsPlayer()) && GetEntry() != 15438)