tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fix AESharedItemStack#compareNBT to get consistent ordering. (#3169)

Browse source
This commit is contained in:
fscan 2017-10-20 23:25:18 +02:00 committed by GitHub
parent cba6c5500f
commit f80f623ccf
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/appeng/container/AEBaseContainer.java
View file

@ -205,7 +205,7 @@ public abstract class AEBaseContainer extends Container
final NBTTagCompound data = CompressedStreamTools.readCompressed( new ByteArrayInputStream( buffer ) );
if( data != null )
{
this.setTargetStack( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( new ItemStack( data ) ) );
this.setTargetStack( AEItemStack.fromNBT( data ) );
}
}
catch( final IOException e )

14
src/main/java/appeng/util/item/AESharedItemStack.java
View file

@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import appeng.api.config.FuzzyMode;
import appeng.util.Platform;
final class AESharedItemStack implements Comparable<AESharedItemStack>
@ -60,7 +59,7 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
@Override
public int hashCode()
{
return Objects.hash( itemStack.getItem(), this.itemDamage );
return Objects.hash( this.itemId, this.itemDamage, this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0 );
}
@Override
@ -110,11 +109,10 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
private int compareNBT( final ItemStack b )
{
if( Platform.itemComparisons().isNbtTagEqual( this.itemStack.getTagCompound(), b.getTagCompound() ) )
if( this.itemStack.getTagCompound() == b.getTagCompound() )
{
return 0;
}
if( this.itemStack.getTagCompound() == LOW_TAG || b.getTagCompound() == HIGH_TAG )
{
return -1;
@ -123,14 +121,6 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
{
return 1;
}
final int nbt = ( this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound().hashCode() : 0 ) - ( b.hasTagCompound() ? b.getTagCompound()
.hashCode() : 0 );
if( nbt != 0 )
{
return nbt;
}
return System.identityHashCode( this.itemStack.getTagCompound() ) - System.identityHashCode( b.getTagCompound() );
}