mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10123] Fixed recent problem with enter to dungeons in group.

Browse source 
Problem related to implicit get map id from player in Group::GetBoundInstance
when in some cases check done before player mapid update.
This commit is contained in:
VladimirMangos 2010-06-30 00:43:46 +04:00
parent 15390df4d9
commit 41f8cfb14c
5 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/Group.cpp
View file

@ -1122,7 +1122,7 @@ bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant, u
else
player->SetGroup(this, group);
// if the same group invites the player back, cancel the homebind timer
InstanceGroupBind *bind = GetBoundInstance(player);
InstanceGroupBind *bind = GetBoundInstance(player->GetMapId(), player);
if(bind && bind->save->GetInstanceId() == player->GetInstanceId())
player->m_InstanceValid = true;
}
@ -1651,9 +1651,8 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
}
}
InstanceGroupBind* Group::GetBoundInstance(Player* player)
InstanceGroupBind* Group::GetBoundInstance(uint32 mapid, Player* player)
{
uint32 mapid = player->GetMapId();
MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
if(!mapEntry)
return NULL;