Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Dungeon Finder: Fix role check algorithm (Some valid combinations were being marked as invalid)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Spp
2010-11-23 15:01:15 +01:00
parent 9ec77e0b63
commit 4dcdb396ad
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/server/game/DungeonFinding/LFGMgr.cpp
View File

@@ -1404,48 +1404,55 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap &groles, bool removeLeaderFlag /*= true
for (LfgRolesMap::iterator it = groles.begin(); it != groles.end(); ++it)
{
switch(it->second)
{
case ROLE_NONE:
if (it->second == ROLE_NONE)
return false;
case ROLE_TANK:
if (tank == LFG_TANKS_NEEDED)
if (it->second & ROLE_TANK)
{
if (tank == LFG_TANKS_NEEDED)
return false;
tank++;
break;
case ROLE_HEALER:
if (healer == LFG_HEALERS_NEEDED)
return false;
healer++;
break;
case ROLE_DAMAGE:
if (damage == LFG_DPS_NEEDED)
return false;
damage++;
break;
default:
if (it->second & ROLE_TANK)
if (it->second != ROLE_TANK)
{
it->second -= ROLE_TANK;
if (CheckGroupRoles(groles, false))
return true;
it->second += ROLE_TANK;
}
else
tank++;
}
if (it->second & ROLE_HEALER)
if (it->second & ROLE_HEALER)
{
if (healer == LFG_HEALERS_NEEDED)
return false;
if (it->second != ROLE_HEALER)
{
it->second -= ROLE_HEALER;
if (CheckGroupRoles(groles, false))
return true;
it->second += ROLE_HEALER;
}
else
healer++;
}
if (it->second & ROLE_DAMAGE)
if (it->second & ROLE_DAMAGE)
{
if (damage == LFG_DPS_NEEDED)
return false;
if (it->second != ROLE_DAMAGE)
{
it->second -= ROLE_DAMAGE;
return CheckGroupRoles(groles, false);
if (CheckGroupRoles(groles, false))
return true;
it->second += ROLE_DAMAGE;
}
break;
else
damage++;
}
}
return true;