diff options
| author | megamage <none@none> | 2009-02-18 16:57:42 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-18 16:57:42 -0600 |
| commit | 50012743e80d471d95e909e281fecd975ad4d9be (patch) | |
| tree | f9921c4a87e5c21ae43074a063d132d70093decd /src/game/Unit.cpp | |
| parent | 104d87ca3b12eb31eea5618dbeb69816611a59ed (diff) | |
| parent | 0ff7fbcd7f48df126e9a190b815ab2f101f91d86 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0c1910d43ea..473be9e88a6 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12377,9 +12377,6 @@ void Unit::SetCharmedOrPossessedBy(Unit* charmer, bool possess) if(GetTypeId() == TYPEID_PLAYER) ((Player*)this)->StopCastingCharm(); - // Charmed stop being charmed - RemoveCharmAuras(); - // Set charmed charmer->SetCharm(this); SetCharmerGUID(charmer->GetGUID()); |