Update CraftBukkit to Minecraft 1.5

2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
--- a/src/main/java/net/minecraft/server/ShapedRecipes.java
+++ b/src/main/java/net/minecraft/server/ShapedRecipes.java
@@ -124,7 +124,7 @@ public class ShapedRecipes implements IRecipe {
                        return false;
                    }

-                    if (itemstack.getData() != -1 && itemstack.getData() != itemstack1.getData()) {
+                    if (itemstack.getData() != 32767 && itemstack.getData() != itemstack1.getData()) {
                        return false;
                    }
                }