summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ContainerFurnace.java
diff options
context:
space:
mode:
authorDinnerbone (Laptop) <dinnerbone@dinnerbone.com>2012-03-30 23:33:51 +0200
committerDinnerbone (Laptop) <dinnerbone@dinnerbone.com>2012-03-30 23:33:51 +0200
commit1fa4d8430e4174d0f8eb5d50667d0247f7877679 (patch)
treea806cee32737d36dbb27576c564d3099f336fbe7 /src/main/java/net/minecraft/server/ContainerFurnace.java
parente0c01154b030c527815e884b6b331c5534ab247f (diff)
downloadcraftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar
craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.gz
craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.lz
craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.xz
craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.zip
Updated version to 1.2.5-R0.1-SNAPSHOT
Diffstat (limited to 'src/main/java/net/minecraft/server/ContainerFurnace.java')
-rw-r--r--src/main/java/net/minecraft/server/ContainerFurnace.java20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/ContainerFurnace.java b/src/main/java/net/minecraft/server/ContainerFurnace.java
index 9e41069a..790d1dd6 100644
--- a/src/main/java/net/minecraft/server/ContainerFurnace.java
+++ b/src/main/java/net/minecraft/server/ContainerFurnace.java
@@ -96,12 +96,20 @@ public class ContainerFurnace extends Container {
}
slot.a(itemstack1, itemstack);
- } else if (i >= 3 && i < 30) {
- if (!this.a(itemstack1, 30, 39, false)) {
- return null;
- }
- } else if (i >= 30 && i < 39) {
- if (!this.a(itemstack1, 3, 30, false)) {
+ } else if (i != 1 && i != 0) {
+ if (FurnaceRecipes.getInstance().getResult(itemstack1.getItem().id) != null) {
+ if (!this.a(itemstack1, 0, 1, false)) {
+ return null;
+ }
+ } else if (TileEntityFurnace.isFuel(itemstack1)) {
+ if (!this.a(itemstack1, 1, 2, false)) {
+ return null;
+ }
+ } else if (i >= 3 && i < 30) {
+ if (!this.a(itemstack1, 30, 39, false)) {
+ return null;
+ }
+ } else if (i >= 30 && i < 39 && !this.a(itemstack1, 3, 30, false)) {
return null;
}
} else if (!this.a(itemstack1, 3, 39, false)) {