mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-16 07:13:43 +01:00
Merge branch 'mc1.15/dev' into mc1.16/dev
This commit is contained in:
commit
9fa63743b6
2 changed files with 3 additions and 1 deletions
|
@ -89,6 +89,7 @@ public class DeployerFakePlayer extends FakePlayer {
|
|||
|
||||
@Override
|
||||
public ItemStack onFoodEaten(World world, ItemStack stack) {
|
||||
stack.shrink(1);
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
|
|
@ -79,7 +79,8 @@ public class OpenEndedPipe extends FlowSource {
|
|||
if (state.contains(HONEY_LEVEL) && state.get(HONEY_LEVEL) >= 5) {
|
||||
if (!simulate)
|
||||
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()
|
||||
|
|
Loading…
Reference in a new issue