--- a/net/minecraft/server/WorldGenMegaTreeAbstract.java
+++ b/net/minecraft/server/WorldGenMegaTreeAbstract.java
@@ -42,7 +42,7 @@
 
                 for (int k = -b0; k <= b0 && flag; ++k) {
                     for (int l = -b0; l <= b0 && flag; ++l) {
-                        if (blockposition.getY() + j < 0 || blockposition.getY() + j >= 256 || !this.a(world.getType(blockposition.a(k, j, l)).getBlock())) {
+                        if (blockposition.getY() + j < 0 || blockposition.getY() + j >= 256 || (!this.a(world.getType(blockposition.a(k, j, l)).getBlock()) && world.getType(blockposition.a(k, j, l)).getBlock() != Blocks.SAPLING)) { // CraftBukkit - ignore our own saplings
                             flag = false;
                         }
                     }