Core/Creatures: Remove resetting of UNIT_FLAG_IMMUNE_TO_PC on combat clearing
This commit is contained in:
1 parent
d59e84fcb2
commit
2387591f1a
3 files changed
+5
-9
No files matched your search
@@ -10359,10 +10359,8 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
|
||||
if (enemy)
|
||||
{
|
||||
if (IsAIEnabled)
|
||||
{
|
||||
creature->AI()->EnterCombat(enemy);
|
||||
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); // unit has engaged in combat, remove immunity so players can fight back
|
||||
}
|
||||
|
||||
if (creature->GetFormation())
|
||||
creature->GetFormation()->MemberAttackStart(creature, enemy);
|
||||
}
|
||||
@@ -10403,9 +10401,6 @@ void Unit::ClearInCombat()
|
||||
// Player's state will be cleared in Player::UpdateContestedPvP
|
||||
if (Creature* creature = ToCreature())
|
||||
{
|
||||
if (creature->GetCreatureTemplate() && creature->GetCreatureTemplate()->unit_flags & UNIT_FLAG_IMMUNE_TO_PC)
|
||||
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); // set immunity state to the one from db on evade
|
||||
|
||||
ClearUnitState(UNIT_STATE_ATTACK_PLAYER);
|
||||
if (HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED))
|
||||
SetUInt32Value(UNIT_DYNAMIC_FLAGS, creature->GetCreatureTemplate()->dynamicflags);
|
||||
|
||||
Reference in new issue
Block a user