Update CraftBukkit to Minecraft 1.7.2

This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions

View File

@@ -41,7 +41,7 @@ public class SlotFurnaceResult extends Slot {
itemstack.a(this.a.world, this.a, this.b);
if (!this.a.world.isStatic) {
int i = this.b;
float f = RecipesFurnace.getInstance().c(itemstack.id);
float f = RecipesFurnace.getInstance().b(itemstack);
int j;
if (f == 0.0F) {
@@ -60,7 +60,7 @@ public class SlotFurnaceResult extends Slot {
TileEntityFurnace furnace = ((TileEntityFurnace) this.inventory);
org.bukkit.block.Block block = a.world.getWorld().getBlockAt(furnace.x, furnace.y, furnace.z);
FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.Material.getMaterial(itemstack.id), itemstack.count, i);
FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), itemstack.count, i);
a.world.getServer().getPluginManager().callEvent(event);
i = event.getExpToDrop();
@@ -74,11 +74,11 @@ public class SlotFurnaceResult extends Slot {
}
this.b = 0;
if (itemstack.id == Item.IRON_INGOT.id) {
if (itemstack.getItem() == Items.IRON_INGOT) {
this.a.a((Statistic) AchievementList.k, 1);
}
if (itemstack.id == Item.COOKED_FISH.id) {
if (itemstack.getItem() == Items.COOKED_FISH) {
this.a.a((Statistic) AchievementList.p, 1);
}
}