package net.glowstone.block.blocktype;

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import net.glowstone.block.GlowBlock;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.inventory.ItemStack;

public class BlockChorusPlant extends BlockType {

    private static final BlockFace[] FACES = new BlockFace[] {BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST};

    @Override
    public Collection<ItemStack> getDrops(GlowBlock block, ItemStack tool) {
        if (random.nextBoolean()) {
            return Collections.unmodifiableList(Arrays.asList(new ItemStack(Material.CHORUS_FRUIT, 1)));
        } else {
            return Collections.unmodifiableList(Arrays.asList());
        }
    }

    @Override
    public boolean canPlaceAt(GlowBlock block, BlockFace against) {
        boolean sideSupport = false;
        for (BlockFace face : FACES) {
            Block relative = block.getRelative(face);
            if (relative.getType() == Material.CHORUS_PLANT && hasDownSupport(relative)) {
                sideSupport = true;
                break;
            }
        }
        if (sideSupport) {
            boolean upperBlocked = !block.getRelative(BlockFace.UP).isEmpty();
            boolean downBlocked = !block.getRelative(BlockFace.DOWN).isEmpty();
            return !(upperBlocked && downBlocked); //Both of the two can't be blocked
        } else {
            return hasDownSupport(block);
        }
    }

    private boolean hasDownSupport(Block block) {
        Block down = block.getRelative(BlockFace.DOWN);
        return down.getType() == Material.CHORUS_PLANT || down.getType() == Material.ENDER_STONE;
    }
}

@@ -117,16 +117,64 @@
 ctions;%0A
+import java.util.concurrent.ThreadLocalRandom;%0A%0A
 import n
@@ -625,14 +625,35 @@
 if (
-random
+ThreadLocalRandom.current()
 .nex

Fix error due to merge in BlockChorusPlant