Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Some improvement of update visibility when players leave map.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-26 20:33:01 -06:00
parent dd5faef024
commit 52a5c5e8e3
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/Map.cpp
View File

@@ -469,6 +469,8 @@ bool Map::Add(Player *player)
SendInitSelf(player);
SendInitTransports(player);
player->m_IsInNotifyList = false;
player->m_Notified = false;
AddNotifier(player);
return true;
@@ -614,12 +616,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)
@@ -798,9 +812,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

11
src/game/Player.cpp
View File

@@ -1714,17 +1714,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
ResetContestedPvP();
/*DestroyForNearbyPlayers();
{
UpdateData data;
for(ClientGUIDs::iterator i = m_clientGUIDs.begin(); i != m_clientGUIDs.end(); ++i)
data.AddOutOfRangeGUID(*i);
WorldPacket packet;
data.BuildPacket(&packet);
GetSession()->SendPacket(&packet);
}*/
m_clientGUIDs.clear();
// remove player from battleground on far teleport (when changing maps)
if(BattleGround const* bg = GetBattleGround())
{