diff --git a/MCGalaxy/Database/SqlQuery.cs b/MCGalaxy/Database/SqlQuery.cs index 418a076cf..4e3f96fee 100644 --- a/MCGalaxy/Database/SqlQuery.cs +++ b/MCGalaxy/Database/SqlQuery.cs @@ -25,8 +25,8 @@ namespace MCGalaxy.SQL { /// Executes an SQL command that does not return any results. public static void Execute(string sql, object[] parameters, bool createDB) { - IDatabaseBackend db = Database.Backend; - using (IDbConnection conn = db.CreateConnection()) { + IDatabaseBackend db = Database.Backend; + using (IDbConnection conn = db.CreateConnection()) { conn.Open(); if (!createDB && db.MultipleSchema) conn.ChangeDatabase(ServerConfig.MySQLDatabaseName); @@ -41,7 +41,7 @@ namespace MCGalaxy.SQL { /// Excecutes an SQL query, invoking a callback on the returned rows one by one. public static object Iterate(string sql, object[] parameters, object arg, ReaderCallback callback) { - IDatabaseBackend db = Database.Backend; + IDatabaseBackend db = Database.Backend; using (IDbConnection conn = db.CreateConnection()) { conn.Open(); if (db.MultipleSchema) diff --git a/MCGalaxy/Drawing/Brushes/CloudyBrush.cs b/MCGalaxy/Drawing/Brushes/CloudyBrush.cs index f962975c1..0924f37c1 100644 --- a/MCGalaxy/Drawing/Brushes/CloudyBrush.cs +++ b/MCGalaxy/Drawing/Brushes/CloudyBrush.cs @@ -47,7 +47,10 @@ namespace MCGalaxy.Drawing.Brushes { public override string Name { get { return "Cloudy"; } } public unsafe override void Configure(DrawOp op, Player p) { - Player.Message(p, "Calculating noise distribution..."); + if (!p.Ignores.DrawOutput) { + Player.Message(p, "Calculating noise distribution..."); + } + // Initalise our noise histogram const int accuracy = 10000; int* values = stackalloc int[accuracy]; @@ -95,8 +98,11 @@ namespace MCGalaxy.Drawing.Brushes { } sum += values[i] / (float)volume; } - thresholds[blocks.Length - 1] = 1; - Player.Message(p, "Finished calculating, now drawing."); + thresholds[blocks.Length - 1] = 1; + + if (!p.Ignores.DrawOutput) { + Player.Message(p, "Finished calculating, now drawing."); + } } int next; diff --git a/MCGalaxy/Levels/LevelConfig.cs b/MCGalaxy/Levels/LevelConfig.cs index f1126c841..cd8169555 100644 --- a/MCGalaxy/Levels/LevelConfig.cs +++ b/MCGalaxy/Levels/LevelConfig.cs @@ -279,7 +279,7 @@ namespace MCGalaxy { try { lock (saveLock) { using (StreamWriter w = new StreamWriter(path)) { - w.WriteLine("#Level properties for " + map); + w.WriteLine("#Level properties for " + map); w.WriteLine("#Drown-time is in tenths of a second"); ConfigElement.Serialise(Server.levelConfig, w, this); }