MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pedestals drop fix

Browse source
This commit is contained in:
Aleksey 2020-11-02 14:53:03 +03:00
parent b8d0a1d93f
commit 97eacdff1c
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/blocks/EndPortalBlock.java
View file

@ -5,6 +5,7 @@ import java.util.Random;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.NetherPortalBlock;
@ -19,6 +20,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.dimension.DimensionType;
import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.interfaces.TeleportingEntity;

11
src/main/java/ru/betterend/blocks/basis/BlockPedestal.java
View file

@ -7,6 +7,8 @@ import java.util.Map;
import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Lists;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockEntityProvider;
@ -175,12 +177,9 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
List<ItemStack> drop = super.getDroppedStacks(state, builder);
List<ItemStack> drop = Lists.newArrayList(super.getDroppedStacks(state, builder));
if (state.isOf(this)) {
PedestalState currentState = state.get(STATE);
if (currentState.equals(PedestalState.BOTTOM) || currentState.equals(PedestalState.PILLAR)) {
return drop;
} else {
if (isPlaceable(state)) {
BlockEntity blockEntity = builder.getNullable(LootContextParameters.BLOCK_ENTITY);
if (blockEntity != null && blockEntity instanceof PedestalBlockEntity) {
PedestalBlockEntity pedestal = (PedestalBlockEntity) blockEntity;
@ -188,6 +187,8 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid
drop.add(pedestal.getStack(0));
}
}
} else {
return drop;
}
}
return drop;