upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ItemStack comparison ignoring capabilities when stack nbt is null. (#6764)

Browse Source
This commit is contained in:
brandon3055 authored and GitHub committed 2020-06-12 15:43:38 -07:00
1 parent 1b89f931eb
commit 0209daec36
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/item/ItemStack.java.patch
+2 -2
View File
@@ -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_);
}
}