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

[10619] Clarify premade groups mode config option.

Browse source 
Also prevent mark group as premade with 0 time wait.
It's any way useless becase at next tick group moved to normal team mode.
This commit is contained in:
VladimirMangos 2010-10-18 09:04:21 +04:00
parent 099f375961
commit 811a86baf5
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/BattleGroundHandler.cpp
View file

@ -31,6 +31,7 @@
#include "ArenaTeam.h" #include "ArenaTeam.h"
#include "Language.h" #include "Language.h"
#include "ScriptCalls.h" #include "ScriptCalls.h"
#include "World.h"
void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recv_data) void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recv_data)
{ {
@ -150,7 +151,8 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
if (grp->GetLeaderGuid() != _player->GetObjectGuid()) if (grp->GetLeaderGuid() != _player->GetObjectGuid())
return; return;
err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0); err = grp->CanJoinBattleGroundQueue(bg, bgQueueTypeId, 0, bg->GetMaxPlayersPerTeam(), false, 0);
isPremade = (grp->GetMembersCount() >= bg->GetMinPlayersPerTeam()); isPremade = sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH) &&
(grp->GetMembersCount() >= bg->GetMinPlayersPerTeam());
} }
// if we're here, then the conditions to join a bg are met. We can proceed in joining. // if we're here, then the conditions to join a bg are met. We can proceed in joining.

6
src/game/BattleGroundMgr.cpp
View file

@ -170,9 +170,11 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, Group* grp, BattleG
//compute index (if group is premade or joined a rated match) to queues //compute index (if group is premade or joined a rated match) to queues
uint32 index = 0; uint32 index = 0;
if (!isRated && !isPremade) if (!isRated && !isPremade)
index += BG_TEAMS_COUNT; index += BG_TEAMS_COUNT; // BG_QUEUE_PREMADE_* -> BG_QUEUE_NORMAL_*
if (ginfo->Team == HORDE) if (ginfo->Team == HORDE)
index++; index++; // BG_QUEUE_*_ALLIANCE -> BG_QUEUE_*_HORDE
DEBUG_LOG("Adding Group to BattleGroundQueue bgTypeId : %u, bracket_id : %u, index : %u", BgTypeId, bracketId, index); DEBUG_LOG("Adding Group to BattleGroundQueue bgTypeId : %u, bracket_id : %u, index : %u", BgTypeId, bracketId, index);
uint32 lastOnlineTime = getMSTime(); uint32 lastOnlineTime = getMSTime();

2
src/mangosd/mangosd.conf.dist.in
View file

@ -1357,7 +1357,7 @@ Death.Bones.BattlegroundOrArena = 1
# BattleGround.PremadeGroupWaitForMatch # BattleGround.PremadeGroupWaitForMatch
# The time in which premade group of 1 faction waits in BG Queue for premade group of other faction # The time in which premade group of 1 faction waits in BG Queue for premade group of other faction
# Default: 1800000 (30 minutes) # Default: 1800000 (30 minutes)
# 0 - disable (not recommended) # 0 - disable premade group matches (group always added to bg team in normal way)
# #
################################################################################################################### ###################################################################################################################

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10618" #define REVISION_NR "10619"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__