fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+1 -1
View File
@@ -205,7 +205,7 @@ public abstract class AEBaseContainer extends Container
final NBTTagCompound data = CompressedStreamTools.readCompressed( new ByteArrayInputStream( buffer ) ); final NBTTagCompound data = CompressedStreamTools.readCompressed( new ByteArrayInputStream( buffer ) );
if( data != null ) if( data != null )
{ {
this.setTargetStack( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( new ItemStack( data ) ) ); this.setTargetStack( AEItemStack.fromNBT( data ) );
} }
} }
catch( final IOException e ) catch( final IOException e )
src/main/java/appeng/util/item/AESharedItemStack.java
+2 -12
View File
@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.util.Platform;
final class AESharedItemStack implements Comparable<AESharedItemStack> final class AESharedItemStack implements Comparable<AESharedItemStack>
@@ -60,7 +59,7 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
@Override @Override
public int hashCode() 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 @Override
@@ -110,11 +109,10 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
private int compareNBT( final ItemStack b ) private int compareNBT( final ItemStack b )
{ {
if( Platform.itemComparisons().isNbtTagEqual( this.itemStack.getTagCompound(), b.getTagCompound() ) ) if( this.itemStack.getTagCompound() == b.getTagCompound() )
{ {
return 0; return 0;
} }
if( this.itemStack.getTagCompound() == LOW_TAG || b.getTagCompound() == HIGH_TAG ) if( this.itemStack.getTagCompound() == LOW_TAG || b.getTagCompound() == HIGH_TAG )
{ {
return -1; return -1;
@@ -123,14 +121,6 @@ final class AESharedItemStack implements Comparable<AESharedItemStack>
{ {
return 1; 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() ); return System.identityHashCode( this.itemStack.getTagCompound() ) - System.identityHashCode( b.getTagCompound() );
} }