mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
[10371] More wide use ObjectGuid in group code.
Also drop some unused functions. And fix some uint32 -> uint6 guid assigns.
This commit is contained in:
parent
acdaac3587
commit
dbe9c6f190
19 changed files with 354 additions and 346 deletions
|
|
@ -1347,9 +1347,9 @@ void WorldSession::HandleResetInstancesOpcode( WorldPacket & /*recv_data*/ )
|
|||
{
|
||||
DEBUG_LOG("WORLD: CMSG_RESET_INSTANCES");
|
||||
|
||||
if(Group *pGroup = _player->GetGroup())
|
||||
if (Group *pGroup = _player->GetGroup())
|
||||
{
|
||||
if(pGroup->IsLeader(_player->GetGUID()))
|
||||
if (pGroup->IsLeader(_player->GetObjectGuid()))
|
||||
{
|
||||
pGroup->ResetInstances(INSTANCE_RESET_ALL, false, _player);
|
||||
pGroup->ResetInstances(INSTANCE_RESET_ALL, true,_player);
|
||||
|
|
@ -1386,12 +1386,12 @@ void WorldSession::HandleSetDungeonDifficultyOpcode( WorldPacket & recv_data )
|
|||
return;
|
||||
}
|
||||
|
||||
if(_player->getLevel() < LEVELREQUIREMENT_HEROIC)
|
||||
if (_player->getLevel() < LEVELREQUIREMENT_HEROIC)
|
||||
return;
|
||||
|
||||
if(Group *pGroup = _player->GetGroup())
|
||||
if (Group *pGroup = _player->GetGroup())
|
||||
{
|
||||
if(pGroup->IsLeader(_player->GetGUID()))
|
||||
if (pGroup->IsLeader(_player->GetObjectGuid()))
|
||||
{
|
||||
// the difficulty is set even if the instances can't be reset
|
||||
//_player->SendDungeonDifficulty(true);
|
||||
|
|
@ -1430,12 +1430,12 @@ void WorldSession::HandleSetRaidDifficultyOpcode( WorldPacket & recv_data )
|
|||
return;
|
||||
}
|
||||
|
||||
if(_player->getLevel() < LEVELREQUIREMENT_HEROIC)
|
||||
if (_player->getLevel() < LEVELREQUIREMENT_HEROIC)
|
||||
return;
|
||||
|
||||
if(Group *pGroup = _player->GetGroup())
|
||||
if (Group *pGroup = _player->GetGroup())
|
||||
{
|
||||
if(pGroup->IsLeader(_player->GetGUID()))
|
||||
if (pGroup->IsLeader(_player->GetObjectGuid()))
|
||||
{
|
||||
// the difficulty is set even if the instances can't be reset
|
||||
//_player->SendDungeonDifficulty(true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue