Fixed 2 same stacks using capabilities without NBT tag not treated equal, fixes #1606

This commit is contained in:
raoulvdberge
2018-01-18 21:51:15 +01:00
parent 688231cfc8
commit 7365964216
2 changed files with 4 additions and 0 deletions

View File

@@ -4,6 +4,7 @@
- Added Spanish translation (Samuelrock) - Added Spanish translation (Samuelrock)
- Fixed issue where the Pattern Grid can only overwrite patterns when blank ones are present (ineternet) - Fixed issue where the Pattern Grid can only overwrite patterns when blank ones are present (ineternet)
- Fixed not being able to extract half a stack of items with max stack size 1 in Grid when using right click (raoulvdberge) - Fixed not being able to extract half a stack of items with max stack size 1 in Grid when using right click (raoulvdberge)
- Fixed 2 same stacks using capabilities without NBT tag not treated equal (raoulvdberge)
- Changed stack quantity of craftable items from 1 to 0 to fix Quantity Sorting (ineternet) - Changed stack quantity of craftable items from 1 to 0 to fix Quantity Sorting (ineternet)
### 1.5.31 ### 1.5.31

View File

@@ -42,6 +42,7 @@ public class Comparer implements IComparer {
left = stripTags(left.copy()); left = stripTags(left.copy());
right = stripTags(right.copy()); right = stripTags(right.copy());
} }
if (!isEqualNBT(left, right)) { if (!isEqualNBT(left, right)) {
return false; return false;
} }
@@ -98,6 +99,8 @@ public class Comparer implements IComparer {
return true; return true;
} else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().hasNoTags()) { } else if (!left.hasTagCompound() && right.hasTagCompound() && right.getTagCompound().hasNoTags()) {
return true; return true;
} else if (!left.hasTagCompound() && !right.hasTagCompound()) {
return true;
} }
return false; return false;