Merges crash bugs into master (#12)
This commit is contained in:
parent
916d404c51
commit
39dfe86e10
8 changed files with 33 additions and 85 deletions
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue