From 4a629518976bbf5b4b43c3f87c1adcb795cc3943 Mon Sep 17 00:00:00 2001 From: Prototik Date: Fri, 15 May 2015 00:01:27 +0700 Subject: [PATCH] Fix fastMatches --- build.gradle | 2 +- patches/net/minecraft/item/ItemStack.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4a4f0fd..afb3e65 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ archivesBaseName = 'kcauldron' ext.mcVersion = "1.7.10" ext.cauldronVersion = "3" ext.forgeVersion = "1403" -ext.revision = "61" +ext.revision = "62" version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${revision}" launch4j { diff --git a/patches/net/minecraft/item/ItemStack.java.patch b/patches/net/minecraft/item/ItemStack.java.patch index 2e0f78a..72934b9 100644 --- a/patches/net/minecraft/item/ItemStack.java.patch +++ b/patches/net/minecraft/item/ItemStack.java.patch @@ -156,7 +156,7 @@ + // Spigot start + public static boolean fastMatches(ItemStack is1, ItemStack is2) { + if (is1 == null && is2 == null) return true; -+ if (is1 != null && is2 != null) return is1.stackSize == is1.stackSize && is1.field_151002_e == is2.field_151002_e && is1.itemDamage == is2.itemDamage; ++ if (is1 != null && is2 != null) return is1.stackSize == is2.stackSize && is1.field_151002_e == is2.field_151002_e && is1.itemDamage == is2.itemDamage; + return false; + } + // Spigot end