diff --git a/src/main/java/com/acethewildfire/acesbs/TODO.txt b/src/main/java/com/acethewildfire/acesbs/TODO.txt
index b18a2b8..53dc290 100644
--- a/src/main/java/com/acethewildfire/acesbs/TODO.txt
+++ b/src/main/java/com/acethewildfire/acesbs/TODO.txt
@@ -59,6 +59,7 @@ Weapons
 - Thot Begon
 - Ahab's Harpoon
 - Soul Crusher (Removes Eternal Armor)
+- Combustable Lemon
 
 Blocks
 X Deep Slate Entropy Ore
diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java
index cafaa5c..54c130f 100644
--- a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java
+++ b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropyBlock.java
@@ -74,6 +74,16 @@ public class EntropyBlock extends Block {
         return stack.isIn(ModTags.Items.ENTROPY_CONVERTABLE);
     }
 
+    @Override
+    public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
+        // Never take fall damage
+        if (entity.bypassesLandingEffects()) {
+            super.onLandedUpon(world, state, pos, entity, 0);
+        } else {
+            entity.handleFallDamage(fallDistance, 0.0F, world.getDamageSources().fall());
+        }
+    }
+
     @Override
     public void appendTooltip(ItemStack stack, Item.TooltipContext context, List<Text> tooltip, TooltipType options) {
         tooltip.add(Text.translatable("tooltip.acesbs.entropy_block.tooltip"));