From 1497eec04a0eee492e0fafe4e15f961c18892fb3 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Fri, 1 Jul 2011 14:05:57 +0200 Subject: [PATCH] Update for 1.7.2 --- pom.xml | 2 +- src/main/java/net/minecraft/server/Block.java | 2 +- src/main/java/net/minecraft/server/BlockPressurePlate.java | 4 ++++ src/main/java/net/minecraft/server/EntityMinecart.java | 4 ++-- src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 388fd84de9..1ccca5af77 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.bukkit minecraft-server - 1.7_01 + 1.7.2 jar compile diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 9ee3399e7d..8183374e2e 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 97b52afacc..f9daa00fa6 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 6633b7afb5..79c946aeb9 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 625d8cc8e9..9ac802a407 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\"");