Fix /os map motd (Thanks FabTheZen), also readd pink/grey/black/white doors back (Thanks Jjp137).

Commands/CmdOverseer.cs

@@ -227,17 +227,15 @@ namespace MCGalaxy.Commands
                 }
             } else if (cmd == "MOTD") {
                 int pos = message.IndexOf("motd ");
-                string newMotd = "";
+                string motd = "";
-                if (message.Split(' ').Length > 2) newMotd = message.Substring(pos + 5);
+                if (message.Split(' ').Length > 2) motd = message.Substring(pos + 5);
-
+                if (motd == "") motd = "ignore";
-                if (newMotd == "") {
+                
-                    Command.all.Find("map").Use(p, "motd ignore");
+                if (motd.Length > 64) {
-                    p.level.Save();
+                    Player.SendMessage(p, "Your motd can be no longer than %b64" + Server.DefaultColor + " characters.");
-                    Level.SaveSettings(p.level);
-                } else if (newMotd.Length > 30) {
-                    Player.SendMessage(p, "Your motd can be no longer than %b30" + Server.DefaultColor + " characters.");
                 } else {
-                    Command.all.Find("map").Use(p, "motd " + newMotd);
+                    p.level.motd = motd;
+                    p.level.ChatLevel("Map's MOTD was changed to: &b" + p.level.motd);
                     p.level.Save();
                     Level.SaveSettings(p.level);
                 }

Commands/building/CustomBlockCommand.cs

@@ -379,7 +379,7 @@ namespace MCGalaxy.Commands {
             
             BlockDefinition.Add(def, defs, p == null ? null : p.level);
             foreach (Player pl in PlayerInfo.players) {
-                if (!pl.HasCpeExt(CpeExt.BlockDefinitions)) continue;             
+                if (!pl.HasCpeExt(CpeExt.BlockDefinitions)) continue;
                 if (!global && p.level != pl.level) continue;
                 if (pl.level == null || !pl.level.HasCustomBlocks) continue;
                 

Levels/Block.Convert.cs

@@ -257,6 +257,10 @@ namespace MCGalaxy
                 case door_book_air: return "door_book_air";
                 case door_cobblestone_air: return "door_cobblestone_air";
                 case door_red_air: return "door_red_air";
+                case door_darkpink_air: return "door_darkpink_air";
+                case door_darkgrey_air: return "door_darkgrey_air";
+                case door_lightgrey_air: return "door_lightgrey_air";
+                case door_white_air: return "door_white_air";
 
                 //"AI" blocks
                 case train: return "train";
@@ -568,6 +572,10 @@ namespace MCGalaxy
 				case "door_gold_air": return door_gold_air;
                 case "door_cobblestone_air": return door_cobblestone_air;
                 case "door_red_air": return door_red_air;
+                case "door_darkpink_air": return door_darkpink_air;
+                case "door_darkgrey_air": return door_darkgrey_air;
+                case "door_lightgrey_air": return door_lightgrey_air;
+                case "door_white_air": return door_white_air;
 
                 case "train": return train;
 
@@ -772,11 +780,15 @@ namespace MCGalaxy
                 case door_iron_air:
 				case door_gold_air:
                 case door_cobblestone_air:
-                case door_red_air: 
                 case door_dirt_air:
                 case door_grass_air:
                 case door_blue_air:
                 case door_book_air:
+                case door_red_air:
+                case door_darkpink_air:
+                case door_darkgrey_air:
+                case door_lightgrey_air:
+                case door_white_air:
                     return air;
                 case door8_air: return red;
                 case door9_air: return lava;
@@ -855,7 +867,11 @@ namespace MCGalaxy
                 case door_book_air: return door_book;
                 case door_cobblestone_air: return door_cobblestone;
                 case door_red_air: return door_red;
-
+                case door_darkpink_air: return door_darkpink;
+                case door_darkgrey_air: return door_darkgrey;
+                case door_lightgrey_air: return door_lightgrey; 
+                case door_white_air: return door_white; 
+                
                 case odoor1_air:
                 case odoor2_air:
                 case odoor3_air:

Levels/Block.ID.cs

@@ -94,6 +94,10 @@ namespace MCGalaxy
         public const byte stonebrick = (byte)65;
         public const byte Zero = 0xff;
 
+        public const byte door_darkpink_air = (byte)66;
+        public const byte door_darkgrey_air = (byte)67;
+        public const byte door_lightgrey_air = (byte)68;
+        public const byte door_white_air = (byte)69;
         public const byte flagbase = (byte)70;
 
         //Seasons

Levels/Block.Permissions.cs

@@ -139,12 +139,16 @@ namespace MCGalaxy
                     case door_iron_air:
                     case door_gold_air:
                     case door_cobblestone_air:
-                    case door_red_air:
                     case door_grass_air:
                     case door_dirt_air:
                     case door_blue_air:
                     case door_book_air:
-
+                    case door_red_air:                        
+                    case door_darkpink_air:
+                    case door_darkgrey_air:
+                    case door_lightgrey_air:
+                    case door_white_air:
+                        
                     case odoor1_air:
                     case odoor2_air:
                     case odoor3_air:

Levels/Block.cs

@@ -494,6 +494,10 @@ namespace MCGalaxy
                 case door_book: return door_book_air;
                 case door_cobblestone: return door_cobblestone_air;
                 case door_red: return door_red_air;
+                case door_darkpink: return door_darkpink_air;
+                case door_darkgrey: return door_darkgrey_air;
+                case door_lightgrey: return door_lightgrey_air; 
+                case door_white: return door_white_air;
                 default: return 0;
             }
         }

Levels/Physics/DoorPhysics.cs

@@ -44,6 +44,10 @@ namespace MCGalaxy.BlockPhysics {
                 case Block.door_gold_air:
                 case Block.door_cobblestone_air:
                 case Block.door_red_air:
+                case Block.door_darkpink_air:
+                case Block.door_darkgrey_air:
+                case Block.door_lightgrey_air:
+                case Block.door_white_air:
 
                 case Block.door_dirt_air:
                 case Block.door_grass_air:

Player/Player.cs

@@ -1174,7 +1174,11 @@ namespace MCGalaxy {
                 case Block.door_gold_air:
                 case Block.door_cobblestone_air:
                 case Block.door_red_air:
-
+                case Block.door_darkpink_air:
+                case Block.door_darkgrey_air:
+                case Block.door_lightgrey_air:
+                case Block.door_white_air:
+            		
                 case Block.door_dirt_air:
                 case Block.door_grass_air:
                 case Block.door_blue_air: