diff --git a/Commands/other/CmdReport.cs b/Commands/other/CmdReport.cs index 8f40b1715..e5e4687dc 100644 --- a/Commands/other/CmdReport.cs +++ b/Commands/other/CmdReport.cs @@ -25,7 +25,7 @@ namespace MCGalaxy.Commands { public override string name { get { return "report"; } } public override string shortcut { get { return ""; } } - public override string type { get { return CommandTypes.Other; } } + public override string type { get { return CommandTypes.Moderation; } } public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] ExtraPerms { diff --git a/Commands/other/CmdServer.cs b/Commands/other/CmdServer.cs index 85ce7ce82..a95b68ae8 100644 --- a/Commands/other/CmdServer.cs +++ b/Commands/other/CmdServer.cs @@ -26,7 +26,7 @@ namespace MCGalaxy.Commands { public sealed class CmdServer : Command { public override string name { get { return "server"; } } public override string shortcut { get { return "serv"; } } - public override string type { get { return CommandTypes.Other; } } + public override string type { get { return CommandTypes.Moderation; } } public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Admin; } } public CmdServer() { } diff --git a/Generator/HeightmapGen.cs b/Generator/HeightmapGen.cs index 0e35a5dab..448428161 100644 --- a/Generator/HeightmapGen.cs +++ b/Generator/HeightmapGen.cs @@ -75,14 +75,16 @@ namespace MCGalaxy.Generator { return false; } - int index = 0, oneY = lvl.Width * lvl.Height; + int index = 0, oneY = lvl.Width * lvl.Length; using (bmp) { for (int z = 0; z < bmp.Height; z++) for (int x = 0; x < bmp.Width; x++) { int height = bmp.GetPixel(x, z).R * lvl.Height / 255; - for (int y = 0; y < height; y++) - lvl.blocks[index + oneY * y] = Block.stone; + for (int y = 0; y < height - 1; y++) + lvl.blocks[index + oneY * y] = Block.dirt; + if (height > 0) + lvl.blocks[index + oneY * (height -1)] = Block.grass; index++; } } diff --git a/Network/IRCBot.cs b/Network/IRCBot.cs index 39ef6c0e8..5a3a34ed7 100644 --- a/Network/IRCBot.cs +++ b/Network/IRCBot.cs @@ -93,7 +93,7 @@ namespace MCGalaxy { users.Clear(); } - public bool IsConnected() { return connection != null && connection.Connected; } + public bool IsConnected() { return connection != null && connection.Connected; } static string ConvertMessage(string message, bool color) {