diff options
| -rw-r--r-- | src/game/Unit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index dc0dfb7d102..18cfd1f3424 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10365,7 +10365,8 @@ void Unit::DestroyForNearbyPlayers() VisitNearbyWorldObject(World::GetMaxVisibleDistance(), searcher); for(std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) if(*iter != this && (*iter)->GetTypeId() == TYPEID_PLAYER - && ((Player*)(*iter))->HaveAtClient(this)) + && ((Player*)(*iter))->HaveAtClient(this) + && GetCharmerGUID() != (*iter)->GetGUID()) // TODO: this is for puppet { DestroyForPlayer((Player*)(*iter)); ((Player*)(*iter))->m_clientGUIDs.erase(GetGUID()); |