diff options
Diffstat (limited to 'src/main/java/net')
4 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java index 012205d0..91b9efd8 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java @@ -81,6 +81,10 @@ public class BlockSapling extends BlockFlower { public int getTypeId(int x, int y, int z) { return this.world.getTypeId(x, y, z); } + + public int getHeight() { + return world.height; + } } // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index cff20b59..58e03167 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -19,9 +19,9 @@ import java.net.UnknownHostException; import jline.ConsoleReader; import joptsimple.OptionSet; import org.bukkit.World.Environment; +import org.bukkit.command.ConsoleCommandSender; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.LoggerOutputStream; -import org.bukkit.craftbukkit.command.ColouredConsoleSender; import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.craftbukkit.util.ServerShutdownThread; import org.bukkit.event.server.ServerCommandEvent; @@ -59,7 +59,7 @@ public class MinecraftServer implements Runnable, ICommandListener { public List<WorldServer> worlds = new ArrayList<WorldServer>(); public CraftServer server; public OptionSet options; - public ColouredConsoleSender console; + public ConsoleCommandSender console; public ConsoleReader reader; public static int currentTick; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 16c85b31..016c3025 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -50,7 +50,7 @@ public class ServerConfigurationManager { public ServerConfigurationManager(MinecraftServer minecraftserver) { minecraftserver.server = new CraftServer(minecraftserver, this); - minecraftserver.console = new ColouredConsoleSender(minecraftserver.server); + minecraftserver.console = ColouredConsoleSender.getInstance(); this.cserver = minecraftserver.server; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index c077d03d..fcc3fd82 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -32,6 +32,10 @@ public class WorldServer extends World implements BlockChangeDelegate { this.manager = new PlayerManager(minecraftserver, this.dimension, minecraftserver.propertyManager.getInt("view-distance", 10)); } + public int getHeight() { + return height; + } + public final int dimension; public EntityTracker tracker; public PlayerManager manager; |