diff options
Diffstat (limited to 'src/main/java/net')
4 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 9ee3399e..8183374e 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -509,7 +509,7 @@ public class Block { return this; } - public int f() { + public int e() { return this.material.j(); } diff --git a/src/main/java/net/minecraft/server/BlockPressurePlate.java b/src/main/java/net/minecraft/server/BlockPressurePlate.java index 97b52afa..f9daa00f 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlate.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlate.java @@ -181,4 +181,8 @@ public class BlockPressurePlate extends Block { public boolean isPowerSource() { return true; } + + public int e() { + return 1; + } } diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java index 6633b7af..79c946ae 100644 --- a/src/main/java/net/minecraft/server/EntityMinecart.java +++ b/src/main/java/net/minecraft/server/EntityMinecart.java @@ -285,7 +285,7 @@ public class EntityMinecart extends Entity implements IInventory { flag2 = !flag1; } - if (((BlockMinecartTrack) Block.byId[l]).e()) { + if (((BlockMinecartTrack) Block.byId[l]).f()) { i1 &= 7; } @@ -608,7 +608,7 @@ public class EntityMinecart extends Entity implements IInventory { int i1 = this.world.getData(i, j, k); d1 = (double) j; - if (((BlockMinecartTrack) Block.byId[l]).e()) { + if (((BlockMinecartTrack) Block.byId[l]).f()) { i1 &= 7; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 625d8cc8..9ac802a4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -89,7 +89,7 @@ public class MinecraftServer implements Runnable, ICommandListener { System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); // CraftBukkit end - log.info("Starting minecraft server version Beta 1.7_01"); + log.info("Starting minecraft server version Beta 1.7.2"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("**** NOT ENOUGH RAM!"); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); |