Check player conditions to enter instance

Port From (https://github.com/TrinityCore/TrinityCore/commit/70cd58765e2e78a691de6b2adf82418bd1e208f8)
2021-11-29 14:50:15 -05:00
parent 614c903fd0
commit bc17b34ab7
1 changed files with 5 additions and 5 deletions
@@ -154,6 +154,10 @@ namespace Game.Entities
            if (player.IsGameMaster())
                return EnterState.CanEnter;

+            //Other requirements
+            if (!player.Satisfy(Global.ObjectMgr.GetAccessRequirement(mapid, targetDifficulty), mapid, true))
+                return EnterState.CannotEnterUnspecifiedReason;
+
            string mapName = entry.MapName[Global.WorldMgr.GetDefaultDbcLocale()];

            Group group = player.GetGroup();
@@ -213,11 +217,7 @@ namespace Game.Entities
                    return EnterState.CannotEnterTooManyInstances;
            }

-            //Other requirements
-            if (player.Satisfy(Global.ObjectMgr.GetAccessRequirement(mapid, targetDifficulty), mapid, true))
-                return EnterState.CanEnter;
-            else
-                return EnterState.CannotEnterUnspecifiedReason;
+            return EnterState.CanEnter;
        }

        public void Update(uint diff)