diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index 79ae31e63..dfb047de9 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -227,17 +227,15 @@ namespace MCGalaxy.Commands } } else if (cmd == "MOTD") { int pos = message.IndexOf("motd "); - string newMotd = ""; - if (message.Split(' ').Length > 2) newMotd = message.Substring(pos + 5); - - if (newMotd == "") { - Command.all.Find("map").Use(p, "motd ignore"); - p.level.Save(); - Level.SaveSettings(p.level); - } else if (newMotd.Length > 30) { - Player.SendMessage(p, "Your motd can be no longer than %b30" + Server.DefaultColor + " characters."); + string motd = ""; + if (message.Split(' ').Length > 2) motd = message.Substring(pos + 5); + if (motd == "") motd = "ignore"; + + if (motd.Length > 64) { + Player.SendMessage(p, "Your motd can be no longer than %b64" + 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); } diff --git a/Commands/building/CustomBlockCommand.cs b/Commands/building/CustomBlockCommand.cs index 738e89a23..0a1500563 100644 --- a/Commands/building/CustomBlockCommand.cs +++ b/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; diff --git a/Levels/Block.Convert.cs b/Levels/Block.Convert.cs index c8948117b..ac7f523f5 100644 --- a/Levels/Block.Convert.cs +++ b/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: diff --git a/Levels/Block.ID.cs b/Levels/Block.ID.cs index 6348e89f8..f4589e1d7 100644 --- a/Levels/Block.ID.cs +++ b/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 diff --git a/Levels/Block.Permissions.cs b/Levels/Block.Permissions.cs index c19107a99..540d2cc9f 100644 --- a/Levels/Block.Permissions.cs +++ b/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: diff --git a/Levels/Block.cs b/Levels/Block.cs index 64b05e30b..f2cfc510a 100644 --- a/Levels/Block.cs +++ b/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; } } diff --git a/Levels/Physics/DoorPhysics.cs b/Levels/Physics/DoorPhysics.cs index 43b8c2dd1..67b0b3dad 100644 --- a/Levels/Physics/DoorPhysics.cs +++ b/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: diff --git a/Player/Player.cs b/Player/Player.cs index 163a03961..f4818af00 100644 --- a/Player/Player.cs +++ b/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: