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

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
simibubi 2021-03-30 18:49:13 +02:00
commit 9fa63743b6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java
View file

@ -89,6 +89,7 @@ public class DeployerFakePlayer extends FakePlayer {
@Override @Override
public ItemStack onFoodEaten(World world, ItemStack stack) { public ItemStack onFoodEaten(World world, ItemStack stack) {
stack.shrink(1);
return stack; return stack;
} }

3
src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
View file

@ -79,7 +79,8 @@ public class OpenEndedPipe extends FlowSource {
if (state.contains(HONEY_LEVEL) && state.get(HONEY_LEVEL) >= 5) { if (state.contains(HONEY_LEVEL) && state.get(HONEY_LEVEL) >= 5) {
if (!simulate) if (!simulate)
world.setBlockState(outputPos, state.with(HONEY_LEVEL, 0), 3); world.setBlockState(outputPos, state.with(HONEY_LEVEL, 0), 3);
return new FluidStack(AllFluids.HONEY.get(), 250); return new FluidStack(AllFluids.HONEY.get()
.getStillFluid(), 250);
} }
if (!waterlog && !state.getMaterial() if (!waterlog && !state.getMaterial()