From a58dcd1d9cf5f943342d00628601170d6023ae25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gautheron?= Date: Sun, 17 Dec 2017 15:29:30 +0100 Subject: [PATCH] Core/Unit: make neutral guards attack players involved in PvP Fix https://github.com/TrinityCore/TrinityCore/issues/17635 (cherry picked from commit e96cf0b2426068947864a36eaece2a9312c0e48e) --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1e2396560da..261ddcd9979 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8421,6 +8421,9 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo Player const* player = playerAffectingAttacker ? playerAffectingAttacker : playerAffectingTarget; Unit const* creature = playerAffectingAttacker ? target : this; + if (creature->IsContestedGuard() && player->HasPlayerFlag(PLAYER_FLAGS_CONTESTED_PVP)) + return true; + if (FactionTemplateEntry const* factionTemplate = creature->GetFactionTemplateEntry()) { if (!(player->GetReputationMgr().GetForcedRankIfAny(factionTemplate)))