Log when non-existent portals/message blocks are autodeleted from a l…

…evel
ClassiCube · Apr 21, 2022 · 6a5c4eb · 6a5c4eb
1 parent d6bf620
commit 6a5c4eb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/MCGalaxy/Commands/building/CmdMaze.cs b/MCGalaxy/Commands/building/CmdMaze.cs
@@ -28,7 +28,7 @@ public sealed class CmdMaze : DrawCmd
 
         protected override DrawOp GetDrawOp(DrawArgs dArgs) {
             MazeDrawOp op = new MazeDrawOp();
-            op.RNG        = MapGen.MakeRng(dArgs.Message);
+            op.rng        = MapGen.MakeRng(dArgs.Message);
             return op;
         }
 

diff --git a/MCGalaxy/Drawing/DrawOps/MazeDrawOp.cs b/MCGalaxy/Drawing/DrawOps/MazeDrawOp.cs
@@ -26,7 +26,7 @@ public class MazeDrawOp : CuboidHollowsDrawOp
     {
         public override string Name { get { return "Maze"; } }
 
-        public Random RNG;
+        public Random rng;
         bool[,] wall;
         int width, length;
 
@@ -58,7 +58,7 @@ public class MazeDrawOp : CuboidHollowsDrawOp
                 for (ushort z = 0; z <= length; z++)
                     if (wall[x, z])
             {
-                output(Place((ushort)(min.X + x + 1), y, (ushort)(min.Z + z + 1), Block.DoubleSlab));
+                output(Place((ushort)(min.X + x + 1),               y, (ushort)(min.Z + z + 1), Block.DoubleSlab));
                 output(Place((ushort)(min.X + x + 1), (ushort)(y + 1), (ushort)(min.Z + z + 1), Block.Leaves));
                 output(Place((ushort)(min.X + x + 1), (ushort)(y + 2), (ushort)(min.Z + z + 1), Block.Leaves));
             }
@@ -111,7 +111,7 @@ public class MazeDrawOp : CuboidHollowsDrawOp
 
         void MoveRandomDir(GridNode P, out GridNode P1, out GridNode P2) {        
             while (true) {
-                int dir = RNG.Next(4);
+                int dir = rng.Next(4);
 
                 switch (dir) {
                     case 0: //go up

diff --git a/MCGalaxy/Levels/LevelDB.cs b/MCGalaxy/Levels/LevelDB.cs
@@ -94,23 +94,37 @@ public static class LevelDB {
             level.hasPortals     = coords.Count > 0;
             if (!level.hasPortals) return;
 
-            foreach (Vec3U16 p in coords) {
+            int deleted = 0;
+            foreach (Vec3U16 p in coords) 
+            {
                 BlockID block = level.GetBlock(p.X, p.Y, p.Z);
                 if (level.Props[block].IsPortal) continue;
+
                 Portal.Delete(map, p.X, p.Y, p.Z);
+                deleted++;
             }
+
+            if (deleted == 0) return;
+            Logger.Log(LogType.BackgroundActivity, "Autodeleted {0} non-existent portals in {1}", deleted, level.name);
         }
 
         internal static void LoadMessages(Level level, string map) {
             List<Vec3U16> coords   = MessageBlock.GetAllCoords(map);
             level.hasMessageBlocks = coords.Count > 0;
             if (!level.hasMessageBlocks) return;
 
-            foreach (Vec3U16 p in coords) {
+            int deleted = 0;
+            foreach (Vec3U16 p in coords) 
+            {
                 BlockID block = level.GetBlock(p.X, p.Y, p.Z);
                 if (level.Props[block].IsMessageBlock) continue;
+
                 MessageBlock.Delete(map, p.X, p.Y, p.Z);
+                deleted++;
             }
+
+            if (deleted == 0) return;
+            Logger.Log(LogType.BackgroundActivity, "Autodeleted {0} non-existent message blocks in {1}", deleted, level.name);
         }
 
         internal static ColumnDesc[] createPortals = new ColumnDesc[] {

diff --git a/MCGalaxy/Server/FileLogger.cs b/MCGalaxy/Server/FileLogger.cs
@@ -21,11 +21,11 @@
 using System.Text;
 using MCGalaxy.Tasks;
 
-namespace MCGalaxy {
-    
-    public static class FileLogger {
-
-        public static string LogPath { get { return msgPath; } }
+namespace MCGalaxy 
+{
+    public static class FileLogger 
+    {       
+        public static string LogPath      { get { return msgPath; } }
         public static string ErrorLogPath { get { return errPath; } }
 
         static bool disposed;
@@ -52,8 +52,8 @@ public static class FileLogger {
             if (now.Year == last.Year && now.Month == last.Month && now.Day == last.Day) return;
 
             last = now;
-            msgPath = "logs/" + now.ToString("yyyy-MM-dd").Replace("/", "-") + ".txt";
-            errPath = "logs/errors/" + now.ToString("yyyy-MM-dd").Replace("/", "-") + "error.log";
+            msgPath = "logs/"        + now.ToString("yyyy-MM-dd") + ".txt";
+            errPath = "logs/errors/" + now.ToString("yyyy-MM-dd") + "error.log";
         }
 
         static void LogMessage(LogType type, string message) {

diff --git a/MCGalaxy/Server/Logger.cs b/MCGalaxy/Server/Logger.cs
@@ -84,8 +84,8 @@ public enum LogType {
 
     /// <summary> Centralised class for outputting log messages. </summary>
     /// <remarks> Outputs can be a file on disc, GUI, the console, etc subscribed to the LogHandler delegate. </remarks>
-    public static class Logger {
-        
+    public static class Logger 
+    {
         public static LogHandler LogHandler;
         static readonly object logLock = new object();