diff options
| author | kandera <kanderadev@gmail.com> | 2012-09-24 07:55:32 -0700 |
|---|---|---|
| committer | kandera <kanderadev@gmail.com> | 2012-09-24 07:55:32 -0700 |
| commit | c0c64da2868a8ee6f8b9e1259fa5c10c6329fbb1 (patch) | |
| tree | a07f62fa00e4f28dd29dd2fd766928747ba39eec | |
| parent | dc935ef8b14721fba81f9aff4c7190df8de5db09 (diff) | |
| parent | 6b5d455023054a4533fe743b5effceb10be7b442 (diff) | |
Merge pull request #6788 from Vincent-Michael/charmer
Core/Spells: Fix no combo points after Mind Control
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e64afb70d5f..555ecef35c3 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16212,12 +16212,16 @@ void Unit::RemoveCharmedBy(Unit* charmer) charmer->ToPlayer()->SetClientControl(charmer, 1); charmer->ToPlayer()->SetViewpoint(this, false); charmer->ToPlayer()->SetClientControl(this, 0); + if (GetTypeId() == TYPEID_PLAYER) + ToPlayer()->SetMover(this); break; case CHARM_TYPE_POSSESS: charmer->ToPlayer()->SetClientControl(charmer, 1); charmer->ToPlayer()->SetViewpoint(this, false); charmer->ToPlayer()->SetClientControl(this, 0); charmer->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + if (GetTypeId() == TYPEID_PLAYER) + ToPlayer()->SetMover(this); break; case CHARM_TYPE_CHARM: if (GetTypeId() == TYPEID_UNIT && charmer->getClass() == CLASS_WARLOCK) |