Misc fixes
This commit is contained in:
@@ -405,7 +405,7 @@ namespace Game.Chat.Commands
|
||||
}
|
||||
|
||||
// update to parent zone if exist (client map show only zones without parents)
|
||||
var zoneEntry = areaEntry.ParentAreaID != 0 && areaEntry.GetFlags().HasFlag(AreaFlags.IsSubzone)
|
||||
var zoneEntry = areaEntry.ParentAreaID != 0 && areaEntry.HasFlag(AreaFlags.IsSubzone)
|
||||
? CliDB.AreaTableStorage.LookupByKey(areaEntry.ParentAreaID)
|
||||
: areaEntry;
|
||||
Cypher.Assert(zoneEntry != null);
|
||||
|
||||
@@ -203,7 +203,7 @@ namespace Game.Chat
|
||||
phases = PhasingHandler.FormatPhases(player.GetPhaseShift());
|
||||
|
||||
AreaTableRecord area = CliDB.AreaTableStorage.LookupByKey(player.GetAreaId());
|
||||
if (area != null && area.GetFlags().HasFlag(AreaFlags.IsSubzone))
|
||||
if (area != null && area.HasFlag(AreaFlags.IsSubzone))
|
||||
{
|
||||
AreaTableRecord zone = CliDB.AreaTableStorage.LookupByKey(area.ParentAreaID);
|
||||
if (zone != null)
|
||||
|
||||
@@ -779,7 +779,7 @@ namespace Game.Chat
|
||||
uint zoneId = player.GetZoneId();
|
||||
|
||||
AreaTableRecord areaEntry = CliDB.AreaTableStorage.LookupByKey(zoneId);
|
||||
if (areaEntry == null || areaEntry.GetFlags().HasFlag(AreaFlags.IsSubzone))
|
||||
if (areaEntry == null || areaEntry.HasFlag(AreaFlags.IsSubzone))
|
||||
{
|
||||
handler.SendSysMessage(CypherStrings.CommandGraveyardwrongzone, graveyardId, zoneId);
|
||||
return false;
|
||||
@@ -1398,7 +1398,7 @@ namespace Game.Chat
|
||||
{
|
||||
zoneName = area.AreaName[locale];
|
||||
|
||||
if (area.GetFlags().HasFlag(AreaFlags.IsSubzone))
|
||||
if (area.HasFlag(AreaFlags.IsSubzone))
|
||||
{
|
||||
AreaTableRecord zone = CliDB.AreaTableStorage.LookupByKey(area.ParentAreaID);
|
||||
if (zone != null)
|
||||
|
||||
Reference in New Issue
Block a user