Updated CraftBukkit to 1.2

This commit is contained in:
Nathan Adams
2012-03-01 10:49:23 +00:00
parent e9ca87000c
commit 543c4879fe
143 changed files with 3710 additions and 4433 deletions

View File

@@ -150,7 +150,7 @@ public final class ItemStack {
}
public void setData(int i) {
this.damage = (this.id > 0) && (this.id < 256) ? Item.byId[this.id].filterData(i) : i; // CraftBukkit
this.damage = (this.id > 0) && (this.id < Block.byId.length) ? Item.byId[this.id].filterData(i) : i; // CraftBukkit
}
public int i() {
@@ -263,8 +263,8 @@ public final class ItemStack {
Item.byId[this.id].a(this, world, entity, i, flag);
}
public void c(World world, EntityHuman entityhuman) {
entityhuman.a(StatisticList.D[this.id], this.count);
public void a(World world, EntityHuman entityhuman, int i) {
entityhuman.a(StatisticList.D[this.id], i);
Item.byId[this.id].d(this, world, entityhuman);
}
@@ -280,7 +280,7 @@ public final class ItemStack {
return this.getItem().d(this);
}
public void a(World world, EntityHuman entityhuman, int i) {
public void b(World world, EntityHuman entityhuman, int i) {
this.getItem().a(this, world, entityhuman, i);
}