Skip to content

Commit c1072cd

Browse files
committed
Merge remote-tracking branch 'origin/master-1.21-lts' into master-26-lts
2 parents fa4e686 + ddf8912 commit c1072cd

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/org/cyclops/integratedcrafting/gametest/GameTestsItemsCraft.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -967,11 +967,12 @@ public void testItemsCraftFencesDoorsConcurrent(GameTestHelper helper) {
967967
helper.assertTrue(partStateWriter.getErrors(CraftingAspects.Write.ITEMSTACK_CRAFT).isEmpty(), "Active aspect has errors");
968968

969969
// Check if items have been crafted
970-
chestContains(helper, chestIn, new ItemStack(Items.OAK_LOG, 33));
971-
chestContains(helper, chestIn, new ItemStack(Items.OAK_PLANKS, 2));
972970
chestContains(helper, chestIn, new ItemStack(Items.OAK_DOOR, 33));
973-
chestContains(helper, chestIn, new ItemStack(Items.STICK, 2));
974971
chestContains(helper, chestIn, new ItemStack(Items.OAK_FENCE, 33));
972+
// The item counts below can vary a bit due to concurrency reasons (e.g. fewer logs and more sticks), which doesn't matter as only the number of selected crafts matters)
973+
// chestContains(helper, chestIn, new ItemStack(Items.OAK_LOG, 33));
974+
// chestContains(helper, chestIn, new ItemStack(Items.OAK_PLANKS, 2));
975+
// chestContains(helper, chestIn, new ItemStack(Items.STICK, 2));
975976
});
976977
}
977978

0 commit comments

Comments
 (0)