Core/Dungeon Finder: Corrections to 8622d49 (Fix teleport coors loading)

w1sht0l1v3 · Oct 22, 2012 · 316fc7c · 316fc7c
1 parent 1e50a08
commit 316fc7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -318,11 +318,9 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */)
     for (LFGDungeonMap::iterator itr = m_LfgDungeonMap.begin(); itr != m_LfgDungeonMap.end(); ++itr)
     {
         LFGDungeonData& dungeon = itr->second;
-        if (dungeon.type == LFG_TYPE_RANDOM)
-            continue;
 
         // No teleport coords in database, load from areatriggers
-        if (dungeon.x == 0.0f && dungeon.y == 0.0f && dungeon.z == 0.0f)
+        if (dungeon.type != LFG_TYPE_RANDOM && dungeon.x == 0.0f && dungeon.y == 0.0f && dungeon.z == 0.0f)
         {
             AreaTrigger const* at = sObjectMgr->GetMapEntranceTrigger(dungeon.map);
             if (!at)
@@ -401,7 +399,9 @@ void LFGMgr::Update(uint32 diff)
                 uint64 pguid = itVotes->first;
                 if (pguid != boot.victim)
                     SendLfgBootProposalUpdate(pguid, boot);
+                SetState(pguid, LFG_STATE_DUNGEON);
             }
+            SetState(itBoot->first, LFG_STATE_DUNGEON);
             m_Boots.erase(itBoot);
         }
     }

diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
@@ -358,14 +358,12 @@ class LFGMgr
         void LoadLFGDungeons(bool reload = false);
         LFGDungeonData const* GetLFGDungeon(uint32 id);
         LFGDungeonMap& GetLFGDungeonMap();
-
-        void ClearState(uint64 guid, char const *debugMsg);
     private:
 
         uint8 GetTeam(uint64 guid);
         uint64 GetGroup(uint64 guid);
         void RestoreState(uint64 guid, char const *debugMsg);
-
+        void ClearState(uint64 guid, char const *debugMsg);
         void SetDungeon(uint64 guid, uint32 dungeon);
         void SetLockedDungeons(uint64 guid, LfgLockMap const& lock);
         void DecreaseKicksLeft(uint64 guid);