summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-01 13:35:36 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-01 13:35:36 +0000
commita726f6de3e49bfa3139aa53416fb0935d289b031 (patch)
treee57c6bc52b98aa213e32c70bb3c0664572142e28
parentfb668b428be81b1126b198c7db6f36b6bcf1eb0e (diff)
downloadcraftbukkit-a726f6de3e49bfa3139aa53416fb0935d289b031.tar
craftbukkit-a726f6de3e49bfa3139aa53416fb0935d289b031.tar.gz
craftbukkit-a726f6de3e49bfa3139aa53416fb0935d289b031.tar.lz
craftbukkit-a726f6de3e49bfa3139aa53416fb0935d289b031.tar.xz
craftbukkit-a726f6de3e49bfa3139aa53416fb0935d289b031.zip
Potentially fixed inventory issues. This (should) fix issue BUKKIT-860
-rw-r--r--pom.xml4
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 42fc0e2b..f3bda0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
- <version>1.1-R5</version>
+ <version>1.1-R6-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
- <version>1.1-R5</version>
+ <version>1.1-R6-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java
index ee381e6b..6e3cabe0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java
@@ -18,11 +18,11 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn
}
public IInventory getResultInventory() {
- return inventory;
+ return resultInventory;
}
public IInventory getMatrixInventory() {
- return resultInventory;
+ return inventory;
}
@Override