--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-03-26 21:54:14 -06:00
commit e9bdfa4d02
4 files changed
+19 -18

No files matched your search

+16 -4
View File
@@ -449,6 +449,8 @@ bool Map::Add(Player *player)
SendInitSelf(player);
SendInitTransports(player);
player->m_IsInNotifyList = false;
player->m_Notified = false;
AddNotifier(player);
return true;
@@ -594,12 +596,24 @@ void Map::RelocationNotify()
for(std::vector<uint64>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter)
{
Unit *unit = ObjectAccessor::GetObjectInWorld(*iter, (Unit*)NULL);
if(!unit || !unit->IsInWorld() || !unit->GetMapId() == GetId())
if(!unit || unit->GetMapId() != GetId())
{
*iter = 0;
continue;
}
if(!unit->IsInWorld())
{
//other objs are done during remove
if(unit->GetTypeId() == TYPEID_PLAYER)
{
Trinity::VisibleChangesNotifier notifier(*unit);
VisitWorld(unit->GetPositionX(), unit->GetPositionY(), World::GetMaxVisibleDistance(), notifier);
}
*iter = 0;
continue;
}
unit->m_Notified = true;
if(unit->GetTypeId() == TYPEID_PLAYER)
@@ -758,9 +772,7 @@ void Map::Update(const uint32 &t_diff)
void Map::Remove(Player *player, bool remove)
{
player->DestroyForNearbyPlayers();
player->m_IsInNotifyList = false;
player->m_Notified = false;
AddUnitToNotify(player);
// this may be called during Map::Update
// after decrement+unlink, ++m_mapRefIter will continue correctly