Skip to content

Supercedes #9329: Check filter before centering package on funnel block, preventing packages getting stuck on funnels that cannot pick them up. #9335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: mc1.20.1/dev
Choose a base branch
from
Open

Supercedes #9329: Check filter before centering package on funnel block, preventing packages getting stuck on funnels that cannot pick them up. #9335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import com.simibubi.create.content.logistics.box.PackageEntity;
import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
import com.simibubi.create.foundation.item.ItemHelper;

import net.createmod.catnip.math.VecHelper;
Expand Down Expand Up @@ -133,7 +135,8 @@ public void entityInside(BlockState state, Level worldIn, BlockPos pos, Entity e
if (projectedDiff < 0 == (direction.getAxisDirection() == AxisDirection.POSITIVE))
return;
float yOffset = direction == Direction.UP ? 0.25f : direction == Direction.DOWN ? -0.5f : -0.5f;
if (!PackageEntity.centerPackage(entityIn, openPos.add(0, yOffset, 0)))
FilteringBehaviour filter = BlockEntityBehaviour.get(worldIn, pos, FilteringBehaviour.TYPE);
if (filter.test(stack) && !PackageEntity.centerPackage(entityIn, openPos.add(0, yOffset, 0)))
return;

ItemStack remainder = tryInsert(worldIn, pos, stack, false);
Expand Down