diff --git a/MCGalaxy/Blocks/Physics/DoorPhysics.cs b/MCGalaxy/Blocks/Physics/DoorPhysics.cs index 4a01f4ade..9323c260f 100644 --- a/MCGalaxy/Blocks/Physics/DoorPhysics.cs +++ b/MCGalaxy/Blocks/Physics/DoorPhysics.cs @@ -66,7 +66,6 @@ namespace MCGalaxy.Blocks.Physics { ushort x, y, z; lvl.IntToPos(C.b, out x, out y, out z); - int oneY = lvl.Width * lvl.Length; ActivateTDoor(lvl, (ushort)(x - 1), y, z); ActivateTDoor(lvl, (ushort)(x + 1), y, z); ActivateTDoor(lvl, x, (ushort)(y - 1), z); diff --git a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs index 655baba00..405cf8db6 100644 --- a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs +++ b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs @@ -697,10 +697,6 @@ namespace MCGalaxy.Commands.CPE { }; internal static void Help(Player p, string cmd) { - // TODO: find a nicer way of doing this - string fullCmd = cmd.Replace("lb", "levelblock") - .Replace("gb", "globalblock"); - Player.Message(p, "%T{0} add [id] %H- begins creating a new custom block.", cmd); Player.Message(p, "%T{0} copy [source id] [new id] %H- clones a new custom block from an existing custom block.", cmd); Player.Message(p, "%T{0} edit [id] [property] [value] %H- edits the given property of that custom block.", cmd); diff --git a/MCGalaxy/Network/IRCPlugin/IRCHandlers.cs b/MCGalaxy/Network/IRCPlugin/IRCHandlers.cs index 1ba23b72c..91b3c3ce3 100644 --- a/MCGalaxy/Network/IRCPlugin/IRCHandlers.cs +++ b/MCGalaxy/Network/IRCPlugin/IRCHandlers.cs @@ -32,7 +32,6 @@ namespace MCGalaxy.Network { volatile bool hookedEvents = false; Dictionary> userMap = new Dictionary>(); DateTime lastWho, lastOpWho; - static char[] trimChars = new char[] { ' ' }; IRCPlugin plugin = new IRCPlugin(); /// Hooks IRC events so they are handled. diff --git a/MCGalaxy/util/Threading/Scheduler.cs b/MCGalaxy/util/Threading/Scheduler.cs index 58646b94b..ac88ade85 100644 --- a/MCGalaxy/util/Threading/Scheduler.cs +++ b/MCGalaxy/util/Threading/Scheduler.cs @@ -98,15 +98,13 @@ namespace MCGalaxy.Tasks { } return minTask; } - - SchedulerTask lastTask = null; + void DoTask(SchedulerTask task) { try { task.Callback(task); } catch (Exception ex) { MCGalaxy.Logger.LogError(ex); } - lastTask = task; if (task.Repeating) { task.NextRun = DateTime.UtcNow.Add(task.Delay);