diff options
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index dea16ec8f35..1be40b33fa7 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12971,6 +12971,10 @@ void Unit::SetCharmedOrPossessedBy(Unit* charmer, bool possess) if(GetTypeId() == TYPEID_PLAYER) ((Player*)this)->StopCastingCharm(); + // StopCastingCharm may remove a possessed pet? + if(!IsInWorld()) + return; + // Set charmed charmer->SetCharm(this); SetCharmerGUID(charmer->GetGUID()); |