aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Unit
diff options
context:
space:
mode:
authorOvah <dreadkiller@gmx.de>2020-02-28 19:22:25 +0100
committerGitHub <noreply@github.com>2020-02-28 19:22:25 +0100
commit6cbfda2fcecdda980b60b359018e520f1daeaf3a (patch)
treefc527920d7bf2840faeca6bb076a35d3b3726c37 /src/server/game/Entities/Unit
parent0583445c05f92baf3ceb07aa842acb1d47804912 (diff)
Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates (#24190)
* Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates * pacified units should only have their melee attacks blocked as counterpart to silence mechanics * Core/Spells: removed unnecessary attack stop call from pacify aura effect handler
Diffstat (limited to 'src/server/game/Entities/Unit')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 7e3fd717190..f00332d27c1 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5493,9 +5493,6 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
if (creature && creature->IsInEvadeMode())
return false;
- if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
- return false;
-
// nobody can attack GM in GM-mode
if (victim->GetTypeId() == TYPEID_PLAYER)
{