From 62d8c8fd9b04c30ffe10c786f42ade3f392266ab Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 7 Dec 2021 13:41:00 -0500
Subject: [PATCH] Core/LFG: Remove dungeon cooldown when completing random
 dungeons

Port From (https://github.com/TrinityCore/TrinityCore/commit/97be87b7d55dbbc794e83bf6a70eff4df397dd91)
---
 Source/Game/DungeonFinding/LFGManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Game/DungeonFinding/LFGManager.cs b/Source/Game/DungeonFinding/LFGManager.cs
index a6a60103e..52a409aec 100644
--- a/Source/Game/DungeonFinding/LFGManager.cs
+++ b/Source/Game/DungeonFinding/LFGManager.cs
@@ -1349,12 +1349,20 @@ namespace Game.DungeonFinding
                 }
 
                 Player player = Global.ObjAccessor.FindPlayer(guid);
-                if (!player || player.GetMap() != currMap)
+                if (player == null)
                 {
                     Log.outDebug(LogFilter.Lfg, $"Group: {gguid}, Player: {guid} not found in world");
                     continue;
                 }
 
+                if (player.GetMap() != currMap)
+                {
+                    Log.outDebug(LogFilter.Lfg, $"Group: {gguid}, Player: {guid} is in a different map");
+                    continue;
+                }
+
+                player.RemoveAurasDueToSpell(SharedConst.LFGSpellDungeonCooldown);
+
                 LFGDungeonData dungeonDone = GetLFGDungeon(dungeonId);
                 uint mapId = dungeonDone != null ? dungeonDone.map : 0;