nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 08:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Unit): fix AoE aggro and contested guard attack logic (#23935)

Browse Source
This commit is contained in:
sogladev
2025-11-29 06:49:01 +01:00
committed by GitHub
parent 1e4bf1bb6d
commit e6e6c6289e
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -14085,7 +14085,22 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
if (repThisToTarget > REP_NEUTRAL
|| (repTargetToThis = target->GetReactionTo(this)) > REP_NEUTRAL)
return false;
{
// contested guards can attack contested PvP players even though players may be friendly
if (!target->IsControlledByPlayer())
return false;
bool isContestedGuard = false;
if (FactionTemplateEntry const* entry = GetFactionTemplateEntry())
isContestedGuard = entry->factionFlags & FACTION_TEMPLATE_FLAG_ATTACK_PVP_ACTIVE_PLAYERS;
bool isContestedPvp = false;
if (Player const* player = target->GetCharmerOrOwnerPlayerOrPlayerItself())
isContestedPvp = player->HasPlayerFlag(PLAYER_FLAGS_CONTESTED_PVP);
if (!isContestedGuard && !isContestedPvp)
return false;
}
// Not all neutral creatures can be attacked (even some unfriendly faction does not react aggresive to you, like Sporaggar)
if (repThisToTarget == REP_NEUTRAL &&