diff --git a/Server/Mobile.cs b/Server/Mobile.cs index 8ffad92a9..ec94cccc1 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -1789,18 +1789,7 @@ namespace Server [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)] public Map LogoutMap{ get; set; } - public Region Region - { - get - { - if (m_Region == null) - if (Map == null) - return Map.Internal.DefaultRegion; - else - return Map.DefaultRegion; - return m_Region; - } - } + public Region Region => m_Region ?? (Map == null ? Map.Internal.DefaultRegion : Map.DefaultRegion); public Packet RemovePacket { diff --git a/Server/Region.cs b/Server/Region.cs index 3b7e9458c..9d16ac806 100644 --- a/Server/Region.cs +++ b/Server/Region.cs @@ -416,7 +416,7 @@ namespace Server return false; } - + // TODO: Memoize this public T GetRegion() where T : Region { @@ -468,7 +468,7 @@ namespace Server return null; } - + public bool IsPartOf() where T : Region { return GetRegion() != null; @@ -840,7 +840,7 @@ namespace Server Console.WriteLine("Could not find root element 'ServerRegions' in Regions.xml"); return; } - + foreach (XmlElement facet in root.SelectNodes("Facet")) { Map map = null; @@ -1172,4 +1172,4 @@ namespace Server return true; } } -} \ No newline at end of file +}