Core/Maps: Prevent creating maps without a valid Map.dbc entry
Closes #9181
This commit is contained in:
1 parent
771598b67a
commit
d232977ec4
3 files changed
+10
-6
No files matched your search
@@ -7376,6 +7376,9 @@ uint32 Player::GetZoneIdFromDB(uint64 guid)
|
||||
float posy = fields[2].GetFloat();
|
||||
float posz = fields[3].GetFloat();
|
||||
|
||||
if (!sMapStore.LookupEntry(map))
|
||||
return 0;
|
||||
|
||||
zone = sMapMgr->GetZoneId(map, posx, posy, posz);
|
||||
|
||||
if (zone > 0)
|
||||
|
||||
@@ -105,16 +105,17 @@ Map* MapManager::CreateBaseMap(uint32 id)
|
||||
{
|
||||
TRINITY_GUARD(ACE_Thread_Mutex, Lock);
|
||||
|
||||
const MapEntry* entry = sMapStore.LookupEntry(id);
|
||||
if (entry && entry->Instanceable())
|
||||
{
|
||||
MapEntry const* entry = sMapStore.LookupEntry(id);
|
||||
ASSERT(entry);
|
||||
|
||||
if (entry->Instanceable())
|
||||
map = new MapInstanced(id, i_gridCleanUpDelay);
|
||||
}
|
||||
else
|
||||
{
|
||||
map = new Map(id, i_gridCleanUpDelay, 0, REGULAR_DIFFICULTY);
|
||||
map->LoadRespawnTimes();
|
||||
}
|
||||
|
||||
i_maps[id] = map;
|
||||
}
|
||||
|
||||
|
||||
@@ -489,14 +489,14 @@ void ScriptMgr::OnGroupRateCalculation(float& rate, uint32 count, bool isRaid)
|
||||
}
|
||||
|
||||
#define SCR_MAP_BGN(M, V, I, E, C, T) \
|
||||
if (V->GetEntry()->T()) \
|
||||
if (V->GetEntry() && V->GetEntry()->T()) \
|
||||
{ \
|
||||
FOR_SCRIPTS(M, I, E) \
|
||||
{ \
|
||||
MapEntry const* C = I->second->GetEntry(); \
|
||||
if (!C) \
|
||||
continue; \
|
||||
if (entry->MapID == V->GetId()) \
|
||||
if (C->MapID == V->GetId()) \
|
||||
{
|
||||
|
||||
#define SCR_MAP_END \
|
||||
|
||||
Reference in new issue
Block a user