ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/LFG): Prevent leaving LFG if in combat (#9466)

Browse source
This commit is contained in:
Noxies 2021-12-02 17:01:22 +01:00 • committed by GitHub
parent d6e8697efe
commit 09a087aed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server/game/DungeonFinding/LFGMgr.cpp
View file

@ -2104,15 +2104,25 @@ namespace lfg
LfgTeleportError error = LFG_TELEPORTERROR_OK;
if (!player->IsAlive())
{
error = LFG_TELEPORTERROR_PLAYER_DEAD;
}
else if (player->IsFalling() || player->HasUnitState(UNIT_STATE_JUMPING))
{
error = LFG_TELEPORTERROR_FALLING;
}
else if (player->IsMirrorTimerActive(FATIGUE_TIMER))
{
error = LFG_TELEPORTERROR_FATIGUE;
}
else if (player->GetVehicle())
{
error = LFG_TELEPORTERROR_IN_VEHICLE;
else if (player->GetCharmGUID())
error = LFG_TELEPORTERROR_CHARMING;
}
else if (player->GetCharmGUID() || player->IsInCombat())
{
error = LFG_TELEPORTERROR_COMBAT;
}
else
{
uint32 mapid = dungeon->map;

2
src/server/game/DungeonFinding/LFGMgr.h
View file

@ -89,7 +89,7 @@ namespace lfg
LFG_TELEPORTERROR_IN_VEHICLE = 3,
LFG_TELEPORTERROR_FATIGUE = 4,
LFG_TELEPORTERROR_INVALID_LOCATION = 6,
LFG_TELEPORTERROR_CHARMING = 8 // FIXME - It can be 7 or 8 (Need proper data)
LFG_TELEPORTERROR_COMBAT = 8 // FIXME - It can be 7 or 8 (Need proper data)
};
/// Queue join results