From 9c80943df96e191c53dc5320d55f405bfd90d2e1 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 3 Jul 2026 23:57:19 -0300 Subject: [PATCH] fix(Core/Unit): require contested guard attacker for friendly-target attack bypass (#26451) Co-authored-by: Claude Fable 5 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 627e90f810..66f57773fd 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10835,7 +10835,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo if (Player const* player = target->GetCharmerOrOwnerPlayerOrPlayerItself()) isContestedPvp = player->HasPlayerFlag(PLAYER_FLAGS_CONTESTED_PVP); - if (!isContestedGuard && !isContestedPvp) + if (!isContestedGuard || !isContestedPvp) return false; }