Merges crash bugs into master (#12)

This commit is contained in:
Kamron Batman 2019-03-03 14:28:24 -08:00 • committed by GitHub
parent 916d404c51
commit 39dfe86e10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 85 deletions

View file

@ -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
{