summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemBlock.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-14 21:03:48 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-15 10:52:37 +0100
commit61ec751ca11f5bff9ec2dd1644982d5628270004 (patch)
tree8829269e1c5807b55566d367bec5ee630d5dfb1d /src/main/java/net/minecraft/server/ItemBlock.java
parent6495eee0c9fddcce2c2aa9bf9c45118abea180c1 (diff)
downloadcraftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.gz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.lz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.xz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.zip
Update for 1.1_01 renames.
We know these updates (can) break plugins bypassing Bukkit. They are needed for smooth updates however. There will be another one right before before 1.1-R1.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBlock.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemBlock.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index 5d161a87..dfe188bf 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -58,7 +58,7 @@ public class ItemBlock extends Item {
return false;
} else if (j == world.height - 1 && Block.byId[this.id].material.isBuildable()) {
return false;
- } else if (world.a(this.id, i, j, k, false, l)) {
+ } else if (world.mayPlace(this.id, i, j, k, false, l)) {
Block block = Block.byId[this.id];
// CraftBukkit start - This executes the placement of the block
@@ -136,7 +136,7 @@ public class ItemBlock extends Item {
return Block.byId[this.id].n();
}
- public String b() {
+ public String getName() {
return Block.byId[this.id].n();
}
}