From b4f26dc1a42e7fb3acc809b852cfe992c6d60212 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 12 Jan 2019 05:23:19 +0100 Subject: [PATCH] Revert "Core/Spells: fixed a logic mistake in SPELL_AURA_MOD_FACTION handling that was causing players not being attackable" This reverts commit c10779a3aa478f85ccf8658dbae14add848ce4cd. --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 394d53a3f98..a922963ba56 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4846,8 +4846,8 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const* aurApp, uint8 mode, target->SetFaction(GetMiscValue()); if (target->GetTypeId() == TYPEID_PLAYER) { - target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); - target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_IGNORE_REPUTATION); + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); + target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_IGNORE_REPUTATION); } } else @@ -4855,8 +4855,8 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const* aurApp, uint8 mode, target->RestoreFaction(); if (target->GetTypeId() == TYPEID_PLAYER) { - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); - target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_IGNORE_REPUTATION); + target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); + target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_IGNORE_REPUTATION); } } }