Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Combat: Allow refresh pvp combat when assisting a unit that is in pvp combat (#26773)

Browse Source 
(cherry picked from commit 372c84392b)
This commit is contained in:
Gildor
2021-08-08 13:18:08 +02:00
committed by Shauren
parent ec1c958d01
commit b6615a45eb
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Combat/CombatManager.cpp
View File

@@ -236,14 +236,11 @@ void CombatManager::InheritCombatStatesFrom(Unit const* who)
}
for (auto& ref : mgr._pvpRefs)
{
if (!IsInCombatWith(ref.first))
{
Unit* target = ref.second->GetOther(who);
if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) ||
(_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)))
continue;
SetInCombatWith(target);
}
Unit* target = ref.second->GetOther(who);
if ((_owner->IsImmuneToPC() && target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) ||
(_owner->IsImmuneToNPC() && !target->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)))
continue;
SetInCombatWith(target);
}
}