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)
This commit is contained in:
@@ -97,9 +97,6 @@ namespace Game.Maps
|
|||||||
|
|
||||||
public TransferAbortReason CanJoinInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, InstanceLock instanceLock)
|
public TransferAbortReason CanJoinInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, InstanceLock instanceLock)
|
||||||
{
|
{
|
||||||
if (!entries.MapDifficulty.HasResetSchedule())
|
|
||||||
return TransferAbortReason.None;
|
|
||||||
|
|
||||||
InstanceLock playerInstanceLock = FindActiveInstanceLock(playerGuid, entries);
|
InstanceLock playerInstanceLock = FindActiveInstanceLock(playerGuid, entries);
|
||||||
if (playerInstanceLock == null)
|
if (playerInstanceLock == null)
|
||||||
return TransferAbortReason.None;
|
return TransferAbortReason.None;
|
||||||
@@ -136,6 +133,9 @@ namespace Game.Maps
|
|||||||
|
|
||||||
public InstanceLock FindActiveInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, bool ignoreTemporary, bool ignoreExpired)
|
public InstanceLock FindActiveInstanceLock(ObjectGuid playerGuid, MapDb2Entries entries, bool ignoreTemporary, bool ignoreExpired)
|
||||||
{
|
{
|
||||||
|
if (!entries.MapDifficulty.HasResetSchedule())
|
||||||
|
return null;
|
||||||
|
|
||||||
InstanceLock instanceLock = FindInstanceLock(_instanceLocksByPlayer, playerGuid, entries);
|
InstanceLock instanceLock = FindInstanceLock(_instanceLocksByPlayer, playerGuid, entries);
|
||||||
|
|
||||||
// Ignore expired and not extended locks
|
// Ignore expired and not extended locks
|
||||||
|
|||||||
Reference in New Issue
Block a user