From af78cf4759b623e8dfd86cf9527a904a332439d0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 23 Mar 2023 07:14:42 -0400 Subject: [PATCH] Core/Instances: Fixed instance locks being incorrectly found and forcing difficulty when entering normal mode dungons Port From (https://github.com/TrinityCore/TrinityCore/commit/5f642b78f04bbbc723d573362ff25f2ede24f5af) --- Source/Game/Maps/Instances/InstanceLockManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Maps/Instances/InstanceLockManager.cs b/Source/Game/Maps/Instances/InstanceLockManager.cs index 6e1dd43d7..1ab9d006f 100644 --- a/Source/Game/Maps/Instances/InstanceLockManager.cs +++ b/Source/Game/Maps/Instances/InstanceLockManager.cs @@ -97,9 +97,6 @@ namespace Game.Maps public TransferAbortReason CanJoinInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, InstanceLock instanceLock) { - if (!entries.MapDifficulty.HasResetSchedule()) - return TransferAbortReason.None; - InstanceLock playerInstanceLock = FindActiveInstanceLock(playerGuid, entries); if (playerInstanceLock == null) return TransferAbortReason.None; @@ -136,6 +133,9 @@ namespace Game.Maps public InstanceLock FindActiveInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, bool ignoreTemporary, bool ignoreExpired) { + if (!entries.MapDifficulty.HasResetSchedule()) + return null; + InstanceLock instanceLock = FindInstanceLock(_instanceLocksByPlayer, playerGuid, entries); // Ignore expired and not extended locks