josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13077 from mik1893/fear_vs_possess

Browse Source 
Core/Unit: Do not give client control back to player after fear/confuse if player is under player charm (UNIT_STATE_POSSESSED)
This commit is contained in:
Duarte Duarte
2014-09-09 23:07:18 +01:00
parent 0609c25e49 fef376c73c
commit 04415f33a7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+4 -2
View File
@@ -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)