From f6fcf9b60ae631bad00ff643a3a01866b0204f69 Mon Sep 17 00:00:00 2001 From: mark Date: Sat, 15 Sep 2007 21:17:08 +0000 Subject: [PATCH] playermobile new Account Account is rather useless, scriptcompiler flukes, etc --- Scripts/Mobiles/PlayerMobile.cs | 7 ------- Server/Mobile.cs | 1 + Server/ScriptCompiler.cs | 12 ++++++++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index 70eff63c5..806abe483 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -105,13 +105,6 @@ namespace Server.Mobiles private int m_GuildMessageHue, m_AllianceMessageHue; - [CommandProperty( AccessLevel.Counselor, AccessLevel.Owner )] - public new Account Account - { - get { return base.Account as Account; } - set { base.Account = value; } - } - #region Getters & Setters public Server.Guilds.RankDefinition GuildRank { diff --git a/Server/Mobile.cs b/Server/Mobile.cs index e4b103ab5..3c8f4e077 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -3479,6 +3479,7 @@ namespace Server private IAccount m_Account; + [CommandProperty( AccessLevel.Counselor, AccessLevel.Owner )] public IAccount Account { get diff --git a/Server/ScriptCompiler.cs b/Server/ScriptCompiler.cs index 39efd291b..3ee8a902b 100644 --- a/Server/ScriptCompiler.cs +++ b/Server/ScriptCompiler.cs @@ -405,13 +405,21 @@ namespace Server foreach( CompilerError e in results.Errors ) { + string file = e.FileName; + + // Rediculous. FileName is null if the warning/error is internally generated in csc. + if ( string.IsNullOrEmpty( file ) ) { + Console.WriteLine( "ScriptCompiler: {0}: {1}", e.ErrorNumber, e.ErrorText ); + continue; + } + Dictionary> table = (e.IsWarning ? warnings : errors); List list = null; - table.TryGetValue( e.FileName, out list ); + table.TryGetValue( file, out list ); if( list == null ) - table[e.FileName] = list = new List(); + table[file] = list = new List(); list.Add( e ); }