Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Objects: Treat areas that have ParentAreaID filled but dont have IsSubzone flag as zones instead of areas

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0ce96adb7a8ae29a577cce268c8bd3742253cf69)
This commit is contained in:
hondacrx
2024-02-01 09:51:04 -05:00
parent b48f777dc6
commit a436f7b2d1
8 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GoCommands.cs
+5 -3
View File
@@ -405,14 +405,16 @@ namespace Game.Chat.Commands
}
// update to parent zone if exist (client map show only zones without parents)
AreaTableRecord zoneEntry = areaEntry.ParentAreaID != 0 ? CliDB.AreaTableStorage.LookupByKey(areaEntry.ParentAreaID) : areaEntry;
var zoneEntry = areaEntry.ParentAreaID != 0 && areaEntry.GetFlags().HasFlag(AreaFlags.IsSubzone)
? CliDB.AreaTableStorage.LookupByKey(areaEntry.ParentAreaID)
: areaEntry;
Cypher.Assert(zoneEntry != null);
x /= 100.0f;
y /= 100.0f;
TerrainInfo terrain = Global.TerrainMgr.LoadTerrain(zoneEntry.ContinentID);
if (!Global.DB2Mgr.Zone2MapCoordinates(areaEntry.ParentAreaID != 0 ? areaEntry.ParentAreaID : areaId, ref x, ref y))
if (!Global.DB2Mgr.Zone2MapCoordinates(zoneEntry.Id, ref x, ref y))
{
handler.SendSysMessage(CypherStrings.InvalidZoneMap, areaId, areaEntry.AreaName[handler.GetSessionDbcLocale()], terrain.GetId(), terrain.GetMapName());
return false;
@@ -545,7 +547,7 @@ namespace Game.Chat.Commands
{
GameObjectData spawnpoint = null;
foreach (var pair in Global.ObjectMgr.GetAllGameObjectData())
{
{
if (pair.Value.Id != goId)
continue;