mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 14:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Contraption launcher

Browse Source 
- Fixed Contraptions being affected by Weighted Ejectors
This commit is contained in:
simibubi 2021-11-22 02:11:36 +01:00
parent 88e487cdf5
commit 67afe74250
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTileEntity.java
View File

@ -31,6 +31,7 @@ import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.ObserverBlock; import net.minecraft.block.ObserverBlock;
import net.minecraft.block.material.PushReaction;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
@ -149,6 +150,8 @@ public class EjectorTileEntity extends KineticTileEntity {
continue; continue;
if (entity instanceof ItemEntity) if (entity instanceof ItemEntity)
continue; continue;
if (entity.getPistonPushReaction() == PushReaction.IGNORE)
continue;
entity.onGround = false; entity.onGround = false;
@ -379,9 +382,14 @@ public class EjectorTileEntity extends KineticTileEntity {
protected void nudgeEntities() { protected void nudgeEntities() {
for (Entity entity : level.getEntitiesOfClass(Entity.class, for (Entity entity : level.getEntitiesOfClass(Entity.class,
new AxisAlignedBB(worldPosition).inflate(-1 / 16f, 0, -1 / 16f))) new AxisAlignedBB(worldPosition).inflate(-1 / 16f, 0, -1 / 16f))) {
if (!entity.isAlive())
continue;
if (entity.getPistonPushReaction() == PushReaction.IGNORE)
continue;
if (!(entity instanceof PlayerEntity)) if (!(entity instanceof PlayerEntity))
entity.setPos(entity.getX(), entity.getY() + .125f, entity.getZ()); entity.setPos(entity.getX(), entity.getY() + .125f, entity.getZ());
}
} }
protected void ejectIfTriggered() { protected void ejectIfTriggered() {