Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 02:43:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix inconsistency with Deployers on contraptions

Browse source 
- Previously Deployers would sometimes collide with the contraption entity they were a part of and their activation would be consumed
This commit is contained in:
reidbhuntley 2021-06-20 11:07:27 -04:00
parent e71d03c375
commit ba0e851487
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
View file

@ -5,9 +5,11 @@ import static net.minecraftforge.eventbus.api.Event.Result.DENY;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockItem;
import net.minecraft.block.DoublePlantBlock;
@ -150,7 +152,9 @@ public class DeployerHandler {
// Check for entities
final ServerWorld world = player.getServerWorld();
List<Entity> entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(clickedPos));
List<Entity> entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(clickedPos)).stream()
.filter(e -> !(e instanceof AbstractContraptionEntity))
.collect(Collectors.toList());
Hand hand = Hand.MAIN_HAND;
if (!entities.isEmpty()) {
Entity entity = entities.get(world.rand.nextInt(entities.size()));