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

@@ -37,7 +37,7 @@ public class ContainerBrewingStand extends Container {
public void addSlotListener(ICrafting icrafting) {
super.addSlotListener(icrafting);
icrafting.setContainerData(this, 0, this.brewingStand.h());
icrafting.setContainerData(this, 0, this.brewingStand.i());
}
public void a() {
@@ -46,12 +46,12 @@ public class ContainerBrewingStand extends Container {
for (int i = 0; i < this.listeners.size(); ++i) {
ICrafting icrafting = (ICrafting) this.listeners.get(i);
if (this.b != this.brewingStand.h()) {
icrafting.setContainerData(this, 0, this.brewingStand.h());
if (this.b != this.brewingStand.i()) {
icrafting.setContainerData(this, 0, this.brewingStand.i());
}
}
this.b = this.brewingStand.h();
this.b = this.brewingStand.i();
}
public boolean b(EntityHuman entityhuman) {
@@ -79,8 +79,12 @@ public class ContainerBrewingStand extends Container {
} else if (!this.a(itemstack1, 4, 40, false)) {
return null;
}
} else if (!this.a(itemstack1, 4, 40, true)) {
return null;
} else {
if (!this.a(itemstack1, 4, 40, true)) {
return null;
}
slot.a(itemstack1, itemstack);
}
if (itemstack1.count == 0) {
@@ -93,7 +97,7 @@ public class ContainerBrewingStand extends Container {
return null;
}
slot.b(itemstack1);
slot.c(itemstack1);
}
return itemstack;