*Rewrite and simplify sendmessagetoset functions. This fixes the bug that player cannot see dummy aura is cancelled when puppet is far away.

--HG--
branch : trunk

1 files changed, 4 insertions, 8 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 3b451bbbc51..edf7f949d26 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1680,18 +1680,14 @@ void Unit::BuildHeartBeatMsg(WorldPacket *data) const
 
 void WorldObject::SendMessageToSet(WorldPacket *data, bool /*fake*/)
 {
-    //if object is in world, map for it already created!
-    Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
-    if(_map)
-        _map->MessageBroadcast(this, data);
+    Trinity::MessageDistDeliverer notifier(this, data, World::GetMaxVisibleDistance());
+    VisitNearbyWorldObject(World::GetMaxVisibleDistance(), notifier);
 }
 
 void WorldObject::SendMessageToSetInRange(WorldPacket *data, float dist, bool /*bToSelf*/)
 {
-    //if object is in world, map for it already created!
-    Map * _map = IsInWorld() ? GetMap() : MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
-    if(_map)
-        _map->MessageDistBroadcast(this, data, dist);
+    Trinity::MessageDistDeliverer notifier(this, data, dist);
+    VisitNearbyWorldObject(dist, notifier);
 }
 
 void WorldObject::SendObjectDeSpawnAnim(uint64 guid)