*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
50012743e8
3 files changed
+15
-3
No files matched your search
@@ -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());
|
||||
|
||||
Reference in new issue
Block a user