From 06f50110713feec2d6957e68ce2c5a5d2a997d6a Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 22 Oct 2013 17:09:41 +0200
Subject: Core/Auras: Added serverside checking for UNIT_FLAG_PACIFIED when
 attempting to start melee attack

Closes #8623
---
 src/server/game/Entities/Unit/Unit.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/server/game/Entities/Unit')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 3b924a88feb..c3a611c441f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8914,6 +8914,9 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
     if (GetTypeId() == TYPEID_PLAYER && IsMounted())
         return false;
 
+    if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED))
+        return false;
+
     // nobody can attack GM in GM-mode
     if (victim->GetTypeId() == TYPEID_PLAYER)
     {
-- 
cgit v1.2.3