Core/Maps: Made instance_template no longer required to create and enter instance maps

src/server/game/Globals/ObjectMgr.cpp

@@ -5536,7 +5536,7 @@ void ObjectMgr::LoadInstanceTemplate()
 
         uint16 mapID = fields[0].GetUInt16();
 
-        if (!MapManager::IsValidMAP(mapID, true))
+        if (!MapManager::IsValidMAP(mapID))
         {
             TC_LOG_ERROR("sql.sql", "ObjectMgr::LoadInstanceTemplate: bad mapid %d for template!", mapID);
             continue;
@@ -6753,31 +6753,26 @@ void ObjectMgr::LoadAccessRequirements()
  */
 AreaTriggerStruct const* ObjectMgr::GetGoBackTrigger(uint32 Map) const
 {
-    bool useParentDbValue = false;
+    Optional<uint32> parentId;
-    uint32 parentId = 0;
     MapEntry const* mapEntry = sMapStore.LookupEntry(Map);
     if (!mapEntry || mapEntry->CorpseMapID < 0)
         return nullptr;
 
     if (mapEntry->IsDungeon())
-    {
+        if (InstanceTemplate const* iTemplate = sObjectMgr->GetInstanceTemplate(Map))
-        InstanceTemplate const* iTemplate = sObjectMgr->GetInstanceTemplate(Map);
+            parentId = iTemplate->Parent;
 
-        if (!iTemplate)
+    uint32 entrance_map = parentId.value_or(mapEntry->CorpseMapID);
-            return nullptr;
 
-        parentId = iTemplate->Parent;
-        useParentDbValue = true;
-    }
-
-    uint32 entrance_map = uint32(mapEntry->CorpseMapID);
     for (AreaTriggerContainer::const_iterator itr = _areaTriggerStore.begin(); itr != _areaTriggerStore.end(); ++itr)
-        if ((!useParentDbValue && itr->second.target_mapId == entrance_map) || (useParentDbValue && itr->second.target_mapId == parentId))
+    {
+        if (itr->second.target_mapId == entrance_map)
         {
             AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(itr->first);
-            if (atEntry && atEntry->ContinentID == Map)
+            if (atEntry && atEntry->ContinentID == int32(Map))
                 return &itr->second;
         }
+    }
     return nullptr;
 }
 

src/server/game/Handlers/MovementHandler.cpp

@@ -34,7 +34,6 @@
 #include "Transport.h"
 #include "Battleground.h"
 #include "InstanceSaveMgr.h"
-#include "ObjectMgr.h"
 #include "Vehicle.h"
 #include "GameTime.h"
 #include "GameClient.h"
@@ -70,10 +69,9 @@ void WorldSession::HandleMoveWorldportAck()
 
     // get the destination map entry, not the current one, this will fix homebind and reset greeting
     MapEntry const* mEntry = sMapStore.LookupEntry(loc.GetMapId());
-    InstanceTemplate const* mInstance = sObjectMgr->GetInstanceTemplate(loc.GetMapId());
 
     // reset instance validity, except if going to an instance inside an instance
-    if (GetPlayer()->m_InstanceValid == false && !mInstance)
+    if (GetPlayer()->m_InstanceValid == false && !!mEntry->IsDungeon())
         GetPlayer()->m_InstanceValid = true;
 
     Map* oldMap = GetPlayer()->GetMap();
@@ -177,7 +175,7 @@ void WorldSession::HandleMoveWorldportAck()
         }
     }
 
-    if (mInstance)
+    if (mEntry->IsDungeon())
     {
         // check if this instance has a reset time and send it to player if so
         Difficulty diff = newMap->GetDifficulty();

src/server/game/Instances/InstanceSaveMgr.cpp

@@ -227,12 +227,6 @@ time_t InstanceSave::GetResetTimeForDB()
         return GetResetTime();
 }
 
-// to cache or not to cache, that is the question
-InstanceTemplate const* InstanceSave::GetTemplate()
-{
-    return sObjectMgr->GetInstanceTemplate(m_mapid);
-}
-
 MapEntry const* InstanceSave::GetMapEntry()
 {
     return sMapStore.LookupEntry(m_mapid);

src/server/game/Instances/InstanceSaveMgr.h

@@ -74,7 +74,6 @@ class TC_GAME_API InstanceSave
         void SetResetTime(time_t resetTime) { m_resetTime = resetTime; }
         time_t GetResetTimeForDB();
 
-        InstanceTemplate const* GetTemplate();
         MapEntry const* GetMapEntry();
 
         /* online players bound to the instance (perm/solo)

src/server/game/Maps/MapManager.cpp

@@ -391,16 +391,9 @@ bool MapManager::DestroyMap(Map* map)
     return true;
 }
 
-bool MapManager::IsValidMAP(uint32 mapid, bool startUp)
+bool MapManager::IsValidMAP(uint32 mapId)
 {
-    MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
+    return sMapStore.LookupEntry(mapId) != nullptr;
-
-    if (startUp)
-        return mEntry ? true : false;
-    else
-        return mEntry && (!mEntry->IsDungeon() || sObjectMgr->GetInstanceTemplate(mapid));
-
-    /// @todo add check for battleground template
 }
 
 void MapManager::UnloadAll()

src/server/game/Maps/MapManager.h

@@ -73,21 +73,21 @@ class TC_GAME_API MapManager
 
         void UnloadAll();
 
-        static bool IsValidMAP(uint32 mapid, bool startUp);
+        static bool IsValidMAP(uint32 mapId);
 
         static bool IsValidMapCoord(uint32 mapid, float x, float y)
         {
-            return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y);
+            return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x, y);
         }
 
         static bool IsValidMapCoord(uint32 mapid, float x, float y, float z)
         {
-            return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z);
+            return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x, y, z);
         }
 
         static bool IsValidMapCoord(uint32 mapid, float x, float y, float z, float o)
         {
-            return IsValidMAP(mapid, false) && Trinity::IsValidMapCoord(x, y, z, o);
+            return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x, y, z, o);
         }
 
         static bool IsValidMapCoord(uint32 mapid, Position const& pos)

src/server/game/Spells/Spell.cpp

@@ -6277,9 +6277,6 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
                                     if (targetBind->perm && targetBind->save != casterBind->save)
                                         return SPELL_FAILED_TARGET_LOCKED_TO_RAID_INSTANCE;
 
-                        InstanceTemplate const* instance = sObjectMgr->GetInstanceTemplate(mapId);
-                        if (!instance)
-                            return SPELL_FAILED_TARGET_NOT_IN_INSTANCE;
                         if (!target->Satisfy(sObjectMgr->GetAccessRequirement(mapId, difficulty), mapId))
                             return SPELL_FAILED_BAD_TARGETS;
                     }