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

@@ -72,13 +72,14 @@ public class ContainerPlayer extends Container {
super.a(entityhuman);
for (int i = 0; i < 4; ++i) {
ItemStack itemstack = this.craftInventory.getItem(i);
ItemStack itemstack = this.craftInventory.splitWithoutUpdate(i);
if (itemstack != null) {
entityhuman.drop(itemstack);
this.craftInventory.setItem(i, (ItemStack) null);
}
}
this.resultInventory.setItem(0, (ItemStack) null);
}
public boolean b(EntityHuman entityhuman) {
@@ -97,6 +98,8 @@ public class ContainerPlayer extends Container {
if (!this.a(itemstack1, 9, 45, true)) {
return null;
}
slot.a(itemstack1, itemstack);
} else if (i >= 9 && i < 36) {
if (!this.a(itemstack1, 36, 45, false)) {
return null;
@@ -119,7 +122,7 @@ public class ContainerPlayer extends Container {
return null;
}
slot.b(itemstack1);
slot.c(itemstack1);
}
return itemstack;