Core/Dungeon finder: Missing changes from previous commit

--HG--
branch : trunk

2 files changed, 8 insertions, 8 deletions

diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 9c3eac719b2..52034147138 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -540,7 +540,7 @@ void LFGMgr::AddToQueue(uint64 guid, LfgRolesMap *roles, LfgDungeonSet *dungeons
     }
     for (LfgRolesMap::const_iterator itRoles = roles->begin(); itRoles != roles->end(); ++itRoles)
         pqInfo->roles[itRoles->first] = itRoles->second;
-  
+
     for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
         pqInfo->dungeons.insert(*it);
 
@@ -920,7 +920,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposalList *proposals)
         plr = sObjectMgr.GetPlayer(it->first);
         if (!plr)
             sLog.outDebug("LFGMgr::CheckCompatibility: (%s) Warning! %u offline!", strGuids.c_str(), it->first);
-            
+
         for (PlayerSet::const_iterator itPlayer = players.begin(); itPlayer != players.end() && plr; ++itPlayer)
         {
             // Do not form a group with ignoring candidates
@@ -1229,7 +1229,7 @@ void LFGMgr::RemoveFromCompatibles(uint64 guid)
     lista.push_back(guid);
     std::string strGuid = ConcatenateGuids(lista);
     lista.clear();
-    
+
     LfgCompatibleMap::iterator it;
     for (LfgCompatibleMap::iterator itNext = m_CompatibleMap.begin(); itNext != m_CompatibleMap.end();)
     {
@@ -1322,7 +1322,7 @@ LfgDungeonSet* LFGMgr::CheckCompatibleDungeons(LfgDungeonMap *dungeonsMap, Playe
 
     LfgDungeonMap::const_iterator itMap = ++dungeonsMap->begin();
     LfgDungeonSet *compatibleDungeons = new LfgDungeonSet();
-    
+
     bool compatibleDungeon;
 
     // Get the first group and compare with the others to select all common dungeons
@@ -1807,7 +1807,7 @@ void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player *player)
     uint32 rDungeonId = *player->GetLfgDungeons()->begin();
     player->GetLfgDungeons()->clear();
     player->SetLfgRoles(ROLE_NONE);
- 
+
     // Give rewards only if its a random dungeon
     LFGDungeonEntry const *dungeon = sLFGDungeonStore.LookupEntry(dungeonId);
     if (!dungeon || dungeon->type != LFG_TYPE_RANDOM)
@@ -2253,7 +2253,7 @@ std::string LFGMgr::ConcatenateGuids(LfgGuidList check)
     if (check.empty())
         return "";
 
-    LfgGuidSet guidSet;   
+    LfgGuidSet guidSet;
     while (!check.empty())
     {
         guidSet.insert(check.front());
diff --git a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
index 86a43fed25b..dfbd755aaf9 100644
--- a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
@@ -355,7 +355,7 @@ void WorldSession::SendLfgJoinResult(uint8 checkResult, uint8 checkValue)
 {
     sLog.outDebug("SMSG_LFG_JOIN_RESULT");
 
-    WorldPacket data(SMSG_LFG_JOIN_RESULT, 4 + 4);
+    WorldPacket data(SMSG_LFG_JOIN_RESULT, 4 + 4 + checkResult == LFG_JOIN_PARTY_NOT_MEET_REQS ? 1 : 0);
     data << uint32(checkResult);                            // Check Result
     data << uint32(checkValue);                             // Check Value
     if (checkResult == LFG_JOIN_PARTY_NOT_MEET_REQS)        // Should never happen - its handled in Mgr but just in case
@@ -387,7 +387,7 @@ void WorldSession::SendLfgPlayerReward(uint32 rdungeonEntry, uint32 sdungeonEntr
         return;
 
     uint8 itemNum = qRew ? qRew->GetRewItemsCount() : 0;
-    
+
     sLog.outDebug("SMSG_LFG_PLAYER_REWARD");
     WorldPacket data(SMSG_LFG_PLAYER_REWARD, 4 + 4 + 1 + 4 + 4 + 4 + 4 + 4 + 1 + itemNum * (4 + 4 + 4));
     data << uint32(rdungeonEntry);                          // Random Dungeon Finished