Core/Objects: Treat areas that have ParentAreaID filled but dont have IsSubzone flag as zones instead of areas
This commit is contained in:
1 parent
4e67618e5f
commit
8acfadc779
9 files changed
+29
-18
No files matched your search
@@ -315,7 +315,9 @@ public:
|
||||
}
|
||||
|
||||
// update to parent zone if exist (client map show only zones without parents)
|
||||
AreaTableEntry const* zoneEntry = areaEntry->ParentAreaID ? sAreaTableStore.LookupEntry(areaEntry->ParentAreaID) : areaEntry;
|
||||
AreaTableEntry const* zoneEntry = areaEntry->ParentAreaID && areaEntry->GetFlags().HasFlag(AreaFlags::IsSubzone)
|
||||
? sAreaTableStore.LookupEntry(areaEntry->ParentAreaID)
|
||||
: areaEntry;
|
||||
ASSERT(zoneEntry);
|
||||
|
||||
std::shared_ptr<TerrainInfo> terrain = sTerrainMgr.LoadTerrain(zoneEntry->ContinentID);
|
||||
|
||||
@@ -428,7 +428,7 @@ public:
|
||||
LocaleConstant localeConstant = handler->GetSessionDbcLocale();
|
||||
|
||||
AreaTableEntry const* area = sAreaTableStore.LookupEntry(p->GetAreaId());
|
||||
if (area)
|
||||
if (area && area->GetFlags().HasFlag(AreaFlags::IsSubzone))
|
||||
{
|
||||
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID);
|
||||
if (zone)
|
||||
|
||||
@@ -1065,7 +1065,7 @@ public:
|
||||
uint32 zoneId = player->GetZoneId();
|
||||
|
||||
AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(zoneId);
|
||||
if (!areaEntry || areaEntry->ParentAreaID != 0)
|
||||
if (!areaEntry || areaEntry->GetFlags().HasFlag(AreaFlags::IsSubzone))
|
||||
{
|
||||
handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDWRONGZONE, graveyardId, zoneId);
|
||||
handler->SetSentErrorMessage(true);
|
||||
@@ -1830,11 +1830,17 @@ public:
|
||||
AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId);
|
||||
if (area)
|
||||
{
|
||||
areaName = area->AreaName;
|
||||
zoneName = area->AreaName[locale];
|
||||
|
||||
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID);
|
||||
if (zone)
|
||||
zoneName = zone->AreaName;
|
||||
if (area->GetFlags().HasFlag(AreaFlags::IsSubzone))
|
||||
{
|
||||
AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID);
|
||||
if (zone)
|
||||
{
|
||||
areaName = zoneName;
|
||||
zoneName = zone->AreaName[locale];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (target)
|
||||
|
||||
Reference in new issue
Block a user