diff --git a/Scripts/Accounting/Account.cs b/Scripts/Accounting/Account.cs
index 885a50c55..c001dc032 100644
--- a/Scripts/Accounting/Account.cs
+++ b/Scripts/Accounting/Account.cs
@@ -597,7 +597,7 @@ namespace Server.Accounting
m_Created = m_LastLogin = DateTime.Now;
m_TotalGameTime = TimeSpan.Zero;
- m_Mobiles = new Mobile[6];
+ m_Mobiles = new Mobile[7];
m_IPRestrictions = new string[0];
m_LoginIPs = new IPAddress[0];
@@ -780,7 +780,7 @@ namespace Server.Accounting
/// Mobile list. Value will never be null.
public static Mobile[] LoadMobiles( XmlElement node )
{
- Mobile[] list = new Mobile[6];
+ Mobile[] list = new Mobile[7];
XmlElement chars = node["chars"];
//int length = Accounts.GetInt32( Accounts.GetAttribute( chars, "length", "6" ), 6 );
@@ -1110,11 +1110,11 @@ namespace Server.Accounting
}
///
- /// Gets the maximum amount of characters allowed to be created on this account. Values other than 1, 5, or 6 are not supported by the client.
+ /// Gets the maximum amount of characters allowed to be created on this account. Values other than 1, 5, 6, or 7 are not supported by the client.
///
public int Limit
{
- get { return ( Core.AOS ? 6 : 5 ); }
+ get { return ( Core.SA ? 7 : Core.AOS ? 6 : 5 ); }
}
///
diff --git a/Scripts/Misc/MapDefinitions.cs b/Scripts/Misc/MapDefinitions.cs
index 745f453b4..f73aa605a 100644
--- a/Scripts/Misc/MapDefinitions.cs
+++ b/Scripts/Misc/MapDefinitions.cs
@@ -20,6 +20,7 @@ namespace Server.Misc
RegisterMap( 2, 2, 2, 2304, 1600, 1, "Ilshenar", MapRules.TrammelRules );
RegisterMap( 3, 3, 3, 2560, 2048, 1, "Malas", MapRules.TrammelRules );
RegisterMap( 4, 4, 4, 1448, 1448, 1, "Tokuno", MapRules.TrammelRules );
+ RegisterMap( 5, 5, 5, 1280, 4096, 1, "TerMur", MapRules.TrammelRules );
RegisterMap( 0x7F, 0x7F, 0x7F, Map.SectorSize, Map.SectorSize, 1, "Internal", MapRules.Internal );
diff --git a/Scripts/Multis/HouseFoundation.cs b/Scripts/Multis/HouseFoundation.cs
index 068cd1db5..ef8fed63b 100644
--- a/Scripts/Multis/HouseFoundation.cs
+++ b/Scripts/Multis/HouseFoundation.cs
@@ -611,10 +611,11 @@ namespace Server.Multis
DesignContext.Add( m, this );
m.Send( new BeginHouseCustomization( this ) );
- if( m.NetState != null )
- SendInfoTo( m.NetState );
+ NetState ns = m.NetState;
+ if( ns != null )
+ SendInfoTo( ns );
- DesignState.SendDetailedInfoTo( m.NetState );
+ DesignState.SendDetailedInfoTo( ns );
}
public override void SendInfoTo( NetState state, bool sendOplPacket )
diff --git a/Server/Map.cs b/Server/Map.cs
index af4e9ac09..a8938daa6 100644
--- a/Server/Map.cs
+++ b/Server/Map.cs
@@ -68,6 +68,7 @@ namespace Server
public static Map Ilshenar { get { return m_Maps[2]; } }
public static Map Malas { get { return m_Maps[3]; } }
public static Map Tokuno { get { return m_Maps[4]; } }
+ public static Map TerMur { get { return m_Maps[5]; } }
public static Map Internal { get { return m_Maps[0x7F]; } }
private static List