From e6f65fc228a65794724a7cddc78dd6579d679250 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 30 May 2022 12:45:30 -0400 Subject: [PATCH] Core/Unit: Fixed Deterrence stopping working for no reason Port From (https://github.com/TrinityCore/TrinityCore/commit/4c632bb69004bace82d8e67247c3831e6971889b) --- 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 d809f4083..4578d9bca 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -1280,7 +1280,7 @@ namespace Game.Entities bool canDodge = !victim.IsTypeId(TypeId.Player) || canParryOrBlock; // if victim is casting or cc'd it can't avoid attacks - if (victim.IsNonMeleeSpellCast(false) || victim.HasUnitState(UnitState.Controlled)) + if (victim.IsNonMeleeSpellCast(false, false, true) || victim.HasUnitState(UnitState.Controlled)) { canDodge = false; canParryOrBlock = false; diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs index 64d63f476..d87ccf0cd 100644 --- a/Source/Game/Entities/Unit/Unit.Spells.cs +++ b/Source/Game/Entities/Unit/Unit.Spells.cs @@ -766,7 +766,7 @@ namespace Game.Entities bool canBlock = spellInfo.HasAttribute(SpellAttr3.BlockableSpell); // if victim is casting or cc'd it can't avoid attacks - if (victim.IsNonMeleeSpellCast(false) || victim.HasUnitState(UnitState.Controlled)) + if (victim.IsNonMeleeSpellCast(false, false, true) || victim.HasUnitState(UnitState.Controlled)) { canDodge = false; canParry = false;