Core/Maps: Replace some Instanceable() checks with IsDungeon()

Port From (https://github.com/TrinityCore/TrinityCore/commit/8466894d816f484f30cdbe47b980a142870c955e)
2022-07-20 21:38:47 -04:00
parent e7bb4745e0
commit 732609fd87
7 changed files with 23 additions and 25 deletions
@@ -82,7 +82,7 @@ namespace Game.Maps
            if (GetId() != mapId || player == null)
                return null;

-            Map map;
+            Map map = null;
            uint newInstanceId;                       // instanceId of the resulting map

            if (IsBattlegroundOrArena())
@@ -106,7 +106,7 @@ namespace Game.Maps
                    }
                }
            }
-            else if(!IsGarrison())
+            else if(IsDungeon())
            {
                InstanceBind pBind = player.GetBoundInstance(GetId(), player.GetDifficultyID(GetEntry()));
                InstanceSave pSave = pBind != null ? pBind.save : null;
@@ -162,7 +162,7 @@ namespace Game.Maps
                        map = CreateInstance(newInstanceId, null, diff, player.GetTeamId());
                }
            }
-            else
+            else if (IsGarrison())
            {
                newInstanceId = (uint)player.GetGUID().GetCounter();
                map = FindInstanceMap(newInstanceId);