Compare commits

..

No commits in common. "e725ae0164dd12b7187ae9cadf66a87be259f307" and "41bf05a17ee5fa18e18b5755b04e3037de1cf20f" have entirely different histories.

3 changed files with 3 additions and 4 deletions

View file

@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.12.2'
version = '1.12.1'
group = 'de.ellpeck.prettypipes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'PrettyPipes'

View file

@ -20,8 +20,7 @@ public class PacketRequest {
public PacketRequest(BlockPos pos, ItemStack stack, int amount) {
this.pos = pos;
this.stack = stack;
if (stack.hasTag())
this.nbtHash = stack.getTag().hashCode();
this.nbtHash = stack.getTag().hashCode();
this.amount = amount;
}

View file

@ -160,7 +160,7 @@ public class ItemTerminalBlockEntity extends BlockEntity implements IPipeConnect
stack = this.networkItems.values().stream()
.map(NetworkItem::asStack)
// don't compare with nbt equality here or the whole hashing thing is pointless
.filter(s -> ItemEquality.compareItems(s, filter) && s.hasTag() && s.getTag().hashCode() == nbtHash)
.filter(s -> ItemEquality.compareItems(s, filter) && s.getTag().hashCode() == nbtHash)
.findFirst().orElse(filter);
}
var requested = this.requestItemImpl(stack, onItemUnavailable(player, false));