Core: Updated to 11.1.7
Port From (https://github.com/TrinityCore/TrinityCore/commit/ceb8d561b44579118b109a9ff71ba415df53bbdc)
This commit is contained in:
@@ -461,13 +461,13 @@ namespace Game.BattleGrounds
|
||||
switch ((BattlegroundQueueIdType)bgQueueTypeId.BgType)
|
||||
{
|
||||
case BattlegroundQueueIdType.Battleground:
|
||||
if (battlemasterList.InstanceType != (int)MapTypes.Battleground)
|
||||
if (battlemasterList.GetPvpType() != BattlemasterType.Battleground)
|
||||
return false;
|
||||
if (bgQueueTypeId.TeamSize != 0)
|
||||
return false;
|
||||
break;
|
||||
case BattlegroundQueueIdType.Arena:
|
||||
if (battlemasterList.InstanceType != (int)MapTypes.Arena)
|
||||
if (battlemasterList.GetPvpType() != BattlemasterType.Arena)
|
||||
return false;
|
||||
if (!bgQueueTypeId.Rated)
|
||||
return false;
|
||||
@@ -479,7 +479,7 @@ namespace Game.BattleGrounds
|
||||
return false;
|
||||
break;
|
||||
case BattlegroundQueueIdType.ArenaSkirmish:
|
||||
if (battlemasterList.InstanceType != (int)MapTypes.Arena)
|
||||
if (battlemasterList.GetPvpType() != BattlemasterType.Arena)
|
||||
return false;
|
||||
if (!bgQueueTypeId.Rated)
|
||||
return false;
|
||||
@@ -785,7 +785,7 @@ namespace Game.BattleGrounds
|
||||
public BattlemasterListRecord BattlemasterEntry;
|
||||
public List<int> MapIDs = new();
|
||||
|
||||
public bool IsArena() { return BattlemasterEntry.InstanceType == (uint)MapTypes.Arena; }
|
||||
public bool IsArena() { return BattlemasterEntry.GetPvpType() == BattlemasterType.Arena; }
|
||||
|
||||
public ushort GetMinPlayersPerTeam()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user