From 941b2ace9f77b260313ae8546503f8852df40832 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 27 Mar 2021 16:44:29 +0300 Subject: [PATCH] Lumecorn & lanceleaf drop fix (#128) --- .../java/ru/betterend/blocks/LanceleafBlock.java | 14 ++++++++++++++ .../java/ru/betterend/blocks/LumecornBlock.java | 14 ++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/LanceleafBlock.java b/src/main/java/ru/betterend/blocks/LanceleafBlock.java index 1a940095..5c3fec89 100644 --- a/src/main/java/ru/betterend/blocks/LanceleafBlock.java +++ b/src/main/java/ru/betterend/blocks/LanceleafBlock.java @@ -1,8 +1,13 @@ package ru.betterend.blocks; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.IntProperty; @@ -13,6 +18,7 @@ import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.PentaShape; import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; +import ru.betterend.util.MHelper; public class LanceleafBlock extends EndPlantBlock { public static final EnumProperty SHAPE = BlockProperties.PENTA_SHAPE; @@ -50,4 +56,12 @@ public class LanceleafBlock extends EndPlantBlock { return state; } } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + if (state.get(SHAPE) == PentaShape.BOTTOM) { + return Collections.singletonList(new ItemStack(EndBlocks.LANCELEAF_SEED)); + } + return MHelper.RANDOM.nextBoolean() ? Collections.emptyList() : Collections.singletonList(new ItemStack(EndBlocks.LANCELEAF_SEED)); + } } diff --git a/src/main/java/ru/betterend/blocks/LumecornBlock.java b/src/main/java/ru/betterend/blocks/LumecornBlock.java index c29c2c95..0fd64805 100644 --- a/src/main/java/ru/betterend/blocks/LumecornBlock.java +++ b/src/main/java/ru/betterend/blocks/LumecornBlock.java @@ -88,19 +88,9 @@ public class LumecornBlock extends BlockBaseNotFull implements IRenderTypeable { public List getDroppedStacks(BlockState state, LootContext.Builder builder) { LumecornShape shape = state.get(SHAPE); if (shape == LumecornShape.BOTTOM_BIG || shape == LumecornShape.BOTTOM_SMALL || shape == LumecornShape.MIDDLE) { - if (MHelper.RANDOM.nextBoolean()) { - return Collections.singletonList(new ItemStack(EndBlocks.LUMECORN_SEED)); - } - else { - return Collections.emptyList(); - } - } - if (MHelper.RANDOM.nextBoolean()) { - return Collections.singletonList(new ItemStack(EndItems.LUMECORN_ROD)); - } - else { - return Collections.emptyList(); + return Collections.singletonList(new ItemStack(EndBlocks.LUMECORN_SEED, MHelper.randRange(1, 2, MHelper.RANDOM))); } + return MHelper.RANDOM.nextBoolean() ? Collections.singletonList(new ItemStack(EndItems.LUMECORN_ROD)) : Collections.emptyList(); } @Override