From 2291ef09c8dd427039398678fc56a1336b8932ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 8 Jan 2020 23:34:57 -0600 Subject: [PATCH] Fix rannuncarpus including filled positions as candidates, causing it to slow down as spots get filled. Closes #3128 --- .../subtile/functional/SubTileRannuncarpus.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 0fc47df2d..8ed42ed16 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -122,14 +122,16 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { private List getCandidatePositions() { int rangePlace = getRange(); int rangePlaceY = getRangeY(); - BlockPos pos = getEffectivePos(); + BlockPos center = getEffectivePos(); BlockState filter = getUnderlyingBlock(); List ret = new ArrayList<>(); - for (BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-rangePlace, -rangePlaceY, -rangePlace), - pos.add(rangePlace, rangePlaceY, rangePlace))) { - if (filter == getWorld().getBlockState(pos_)) - ret.add(pos_.toImmutable()); + for (BlockPos pos : BlockPos.getAllInBoxMutable(center.add(-rangePlace, -rangePlaceY, -rangePlace), + center.add(rangePlace, rangePlaceY, rangePlace))) { + BlockState state = getWorld().getBlockState(pos); + BlockState up = getWorld().getBlockState(pos.up()); + if (filter == state && (up.isAir(getWorld(), pos.up()) || up.getMaterial().isReplaceable())) + ret.add(pos.toImmutable()); } return ret; }