Update for 1.7.2

This commit is contained in:
Erik Broes 2011-07-01 14:05:57 +02:00
parent 25f72c9caa
commit 1497eec04a
5 changed files with 9 additions and 5 deletions

View File

@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
<version>1.7_01</version> <version>1.7.2</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

View File

@ -509,7 +509,7 @@ public class Block {
return this; return this;
} }
public int f() { public int e() {
return this.material.j(); return this.material.j();
} }

View File

@ -181,4 +181,8 @@ public class BlockPressurePlate extends Block {
public boolean isPowerSource() { public boolean isPowerSource() {
return true; return true;
} }
public int e() {
return 1;
}
} }

View File

@ -285,7 +285,7 @@ public class EntityMinecart extends Entity implements IInventory {
flag2 = !flag1; flag2 = !flag1;
} }
if (((BlockMinecartTrack) Block.byId[l]).e()) { if (((BlockMinecartTrack) Block.byId[l]).f()) {
i1 &= 7; i1 &= 7;
} }
@ -608,7 +608,7 @@ public class EntityMinecart extends Entity implements IInventory {
int i1 = this.world.getData(i, j, k); int i1 = this.world.getData(i, j, k);
d1 = (double) j; d1 = (double) j;
if (((BlockMinecartTrack) Block.byId[l]).e()) { if (((BlockMinecartTrack) Block.byId[l]).f()) {
i1 &= 7; i1 &= 7;
} }

View File

@ -89,7 +89,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end // 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) { if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("**** NOT ENOUGH RAM!"); log.warning("**** NOT ENOUGH RAM!");
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");