[Bleeding] Added support for all TreeType entries to CraftWorld.generateTree(). Addresses BUKKIT-1161

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/net/minecraft/server/WorldGenGroundBush.java b/src/main/java/net/minecraft/server/WorldGenGroundBush.java
index 3b21c52f..63226648 100644
--- a/src/main/java/net/minecraft/server/WorldGenGroundBush.java
+++ b/src/main/java/net/minecraft/server/WorldGenGroundBush.java
@@ -4,7 +4,7 @@ import java.util.Random;
 
 import org.bukkit.BlockChangeDelegate; // CraftBukkit
 
-public class WorldGenGroundBush extends WorldGenerator {
+public class WorldGenGroundBush extends WorldGenerator implements BlockSapling.TreeGenerator { // CraftBukkit - add interface
 
     private int a;
     private int b;
@@ -49,8 +49,11 @@ public class WorldGenGroundBush extends WorldGenerator {
                     }
                 }
             }
+        // CraftBukkit start - return false if gen was unsuccessful
+        } else {
+            return false;
         }
-
+        // CraftBukkit end
         return true;
     }
 }