Updated version to 1.2.5-R0.1-SNAPSHOT

This commit is contained in:
Dinnerbone (Laptop)
2012-03-30 23:33:51 +02:00
parent e0c01154b0
commit 1fa4d8430e
15 changed files with 100 additions and 166 deletions

View File

@@ -6,11 +6,9 @@ import java.util.List;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.FurnaceBurnEvent;
import org.bukkit.event.inventory.FurnaceSmeltEvent;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
// CraftBukkit end
public class TileEntityFurnace extends TileEntity implements IInventory {
@@ -116,7 +114,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
this.burnTime = nbttagcompound.getShort("BurnTime");
this.cookTime = nbttagcompound.getShort("CookTime");
this.ticksForCurrentFuel = this.fuelTime(this.items[1]);
this.ticksForCurrentFuel = fuelTime(this.items[1]);
}
public void b(NBTTagCompound nbttagcompound) {
@@ -177,7 +175,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
if (this.burnTime <= 0 && this.canBurn() && this.items[1] != null) { // CraftBukkit - == to <=
CraftItemStack fuel = new CraftItemStack(this.items[1]);
FurnaceBurnEvent furnaceBurnEvent = new FurnaceBurnEvent(this.world.getWorld().getBlockAt(this.x, this.y, this.z), fuel, this.fuelTime(this.items[1]));
FurnaceBurnEvent furnaceBurnEvent = new FurnaceBurnEvent(this.world.getWorld().getBlockAt(this.x, this.y, this.z), fuel, fuelTime(this.items[1]));
this.world.getServer().getPluginManager().callEvent(furnaceBurnEvent);
if (furnaceBurnEvent.isCancelled()) {
@@ -267,7 +265,7 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
}
}
private int fuelTime(ItemStack itemstack) {
public static int fuelTime(ItemStack itemstack) {
if (itemstack == null) {
return 0;
} else {
@@ -277,6 +275,10 @@ public class TileEntityFurnace extends TileEntity implements IInventory {
}
}
public static boolean isFuel(ItemStack itemstack) {
return fuelTime(itemstack) > 0;
}
public boolean a(EntityHuman entityhuman) {
return this.world.getTileEntity(this.x, this.y, this.z) != this ? false : entityhuman.e((double) this.x + 0.5D, (double) this.y + 0.5D, (double) this.z + 0.5D) <= 64.0D;
}