From 0209daec36e71a0b9bee13549fc19f332f99dfb9 Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Sat, 13 Jun 2020 08:43:38 +1000 Subject: [PATCH] Fixed ItemStack comparison ignoring capabilities when stack nbt is null. (#6764) --- patches/minecraft/net/minecraft/item/ItemStack.java.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 9a155ff51..dc7384472 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -177,7 +177,7 @@ return false; } else { - return p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d); -+ return p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d) && p_77970_0_.areCapsCompatible(p_77970_1_); ++ return (p_77970_0_.field_77990_d == null || p_77970_0_.field_77990_d.equals(p_77970_1_.field_77990_d)) && p_77970_0_.areCapsCompatible(p_77970_1_); } } else { return false; @@ -186,7 +186,7 @@ return false; } else { - return this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d); -+ return this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d) && this.areCapsCompatible(p_77959_1_); ++ return (this.field_77990_d == null || this.field_77990_d.equals(p_77959_1_.field_77990_d)) && this.areCapsCompatible(p_77959_1_); } }