Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Instances: Fixed instance locks being incorrectly found and forcing difficulty when entering normal mode dungons

Browse Source
This commit is contained in:
Shauren
2023-03-21 11:07:10 +01:00
parent 356c0c8afc
commit 5f642b78f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Instances/InstanceLockMgr.cpp
View File

@@ -173,9 +173,6 @@ void InstanceLockMgr::Unload()
TransferAbortReason InstanceLockMgr::CanJoinInstanceLock(ObjectGuid const& playerGuid, MapDb2Entries const& entries, InstanceLock const* instanceLock) const
{
if (!entries.MapDifficulty->HasResetSchedule())
return TRANSFER_ABORT_NONE;
InstanceLock const* playerInstanceLock = FindActiveInstanceLock(playerGuid, entries);
if (!playerInstanceLock)
return TRANSFER_ABORT_NONE;
@@ -215,6 +212,9 @@ InstanceLock* InstanceLockMgr::FindActiveInstanceLock(ObjectGuid const& playerGu
InstanceLock* InstanceLockMgr::FindActiveInstanceLock(ObjectGuid const& playerGuid, MapDb2Entries const& entries, bool ignoreTemporary, bool ignoreExpired) const
{
if (!entries.MapDifficulty->HasResetSchedule())
return nullptr;
std::shared_lock<std::shared_mutex> guard(_locksMutex);
InstanceLock* lock = FindInstanceLock(_instanceLocksByPlayer, playerGuid, entries);