diff options
| author | mik1893 <michele.roscelli@gmail.com> | 2014-09-09 18:49:01 +0200 |
|---|---|---|
| committer | mik1893 <michele.roscelli@gmail.com> | 2014-09-09 23:27:33 +0200 |
| commit | fef376c73cc91a52cf86879f39a56950575a727e (patch) | |
| tree | e7337d8bf7fa3709a25a756a2954d9cba7dd10f6 | |
| parent | 5e745f3fbba4956c9ed732c74016e6ed8a6e1143 (diff) | |
Core/Unit: Do not give client control back to player after fear
if player is under player charm (UNIT_STATE_POSSESSED)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bfa57ef64b8..8404187d09b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15707,7 +15707,8 @@ void Unit::SetFeared(bool apply) } if (Player* player = ToPlayer()) - player->SetClientControl(this, !apply); + if(!player->HasUnitState(UNIT_STATE_POSSESSED)) + player->SetClientControl(this, !apply); } void Unit::SetConfused(bool apply) @@ -15729,7 +15730,8 @@ void Unit::SetConfused(bool apply) } if (Player* player = ToPlayer()) - player->SetClientControl(this, !apply); + if (!player->HasUnitState(UNIT_STATE_POSSESSED)) + player->SetClientControl(this, !apply); } bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* aurApp) |