Merge remote-tracking branch 'upstream/master' into Playerbot
# Conflicts: # src/server/game/Spells/SpellInfoCorrections.cpp # src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
This commit is contained in:
@@ -590,7 +590,7 @@ namespace lfg
|
||||
void DecreaseKicksLeft(ObjectGuid guid);
|
||||
void SetState(ObjectGuid guid, LfgState state);
|
||||
void SetCanOverrideRBState(ObjectGuid guid, bool val);
|
||||
void GetCompatibleDungeons(LfgDungeonSet& dungeons, LfgGuidSet const& players, LfgLockPartyMap& lockMap);
|
||||
void GetCompatibleDungeons(LfgDungeonSet& dungeons, LfgGuidSet const& players, LfgLockPartyMap& lockMap, bool isRDF = false);
|
||||
void _SaveToDB(ObjectGuid guid);
|
||||
|
||||
// Proposals
|
||||
|
||||
Reference in New Issue
Block a user