diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2014-09-09 23:07:18 +0100 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2014-09-09 23:07:18 +0100 |
| commit | 04415f33a7646f9f2a148a087a1603826599fc76 (patch) | |
| tree | 92391c9b0cd08d897f01c4cf70fe529f0872f604 /src | |
| parent | 0609c25e490db0643d882f966739d8d83f6c0cfd (diff) | |
| parent | fef376c73cc91a52cf86879f39a56950575a727e (diff) | |
Merge pull request #13077 from mik1893/fear_vs_possess
Core/Unit: Do not give client control back to player after fear/confuse if player is under player charm (UNIT_STATE_POSSESSED)
Diffstat (limited to 'src')
| -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) |