Merge branch 'mc1.18/dev' into mc1.19/dev

PiTheGuy · Sep 21, 2023 · da9f15c · da9f15c
2 parents 52efa49 + 2e1bcdb
commit da9f15c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.../java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java b/.../java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
@@ -33,6 +33,7 @@
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.utility.BlockHelper;
 import com.simibubi.create.foundation.utility.Couple;
+import com.simibubi.create.foundation.utility.Iterate;
 import com.simibubi.create.foundation.utility.Pair;
 import com.simibubi.create.foundation.utility.VecHelper;
 import com.simibubi.create.infrastructure.config.AllConfigs;
@@ -101,6 +102,11 @@ protected float getBlockBreakingSpeed(MovementContext context) {
 
 	@Override
 	public boolean canBreak(Level world, BlockPos breakingPos, BlockState state) {
+		for (Direction side : Iterate.directions)
+			if (world.getBlockState(breakingPos.relative(side))
+				.is(BlockTags.PORTALS))
+				return false;
+
 		return super.canBreak(world, breakingPos, state) && !state.getCollisionShape(world, breakingPos)
 			.isEmpty() && !AllBlocks.TRACK.has(state);
 	}