diff --git a/Scripts/Engines/Reports/Reports.cs b/Scripts/Engines/Reports/Reports.cs index 8e50bbaac..091c96fe8 100644 --- a/Scripts/Engines/Reports/Reports.cs +++ b/Scripts/Engines/Reports/Reports.cs @@ -13,8 +13,13 @@ namespace Server.Engines.Reports { public class Reports { + public static bool Enabled = false; + public static void Initialize() { + if ( !Enabled ) + return; + m_StatsHistory = new SnapshotHistory(); m_StatsHistory.Load(); diff --git a/Scripts/Misc/WebStatus.cs b/Scripts/Misc/WebStatus.cs index bfb58d618..4401d6728 100644 --- a/Scripts/Misc/WebStatus.cs +++ b/Scripts/Misc/WebStatus.cs @@ -9,9 +9,12 @@ namespace Server.Misc { public class StatusPage : Timer { + public static bool Enabled = false; + public static void Initialize() { - new StatusPage().Start(); + if ( Enabled ) + new StatusPage().Start(); } public StatusPage() : base( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromSeconds( 60.0 ) ) diff --git a/Scripts/Multis/HousePlacement.cs b/Scripts/Multis/HousePlacement.cs index 0259888df..6dafdd8a7 100644 --- a/Scripts/Multis/HousePlacement.cs +++ b/Scripts/Multis/HousePlacement.cs @@ -319,7 +319,16 @@ namespace Server.Multis { Point2D yardPoint = yard[i]; - IPooledEnumerable eable = map.GetMultiTilesAt( yardPoint.X, yardPoint.Y ); + Sector sector = Map.GetSector( yardPoint ); + + foreach ( BaseMulti multi in sector.Multis ) { + if ( multi is BaseBoat ) + continue; + + return HousePlacementResult.BadStatic; // Broke rule #3 + } + + /*IPooledEnumerable eable = map.GetMultiTilesAt( yardPoint.X, yardPoint.Y ); foreach ( Tile[] tile in eable ) { @@ -333,7 +342,7 @@ namespace Server.Multis } } - eable.Free(); + eable.Free();*/ } return HousePlacementResult.Valid; diff --git a/Server/Mobile.cs b/Server/Mobile.cs index 3c8f4e077..e4b103ab5 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -3479,7 +3479,6 @@ namespace Server private IAccount m_Account; - [CommandProperty( AccessLevel.Counselor, AccessLevel.Owner )] public IAccount Account { get