Update CraftBukkit to Minecraft 1.3.1

1 files changed, 12 insertions, 5 deletions

diff --git a/src/main/java/net/minecraft/server/WorldGenTrees.java b/src/main/java/net/minecraft/server/WorldGenTrees.java
index 518ed0dc..71f3fed0 100644
--- a/src/main/java/net/minecraft/server/WorldGenTrees.java
+++ b/src/main/java/net/minecraft/server/WorldGenTrees.java
@@ -24,11 +24,7 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
     }
 
     public boolean a(World world, Random random, int i, int j, int k) {
-        // CraftBukkit start
-        // sk: The idea is to have (our) WorldServer implement
-        // BlockChangeDelegate and then we can implicitly cast World to
-        // WorldServer (a safe cast, AFAIK) and no code will be broken. This
-        // then allows plugins to catch manually-invoked generation events
+        // CraftBukkit start - moved to generate
         return this.generate((BlockChangeDelegate) world, random, i, j, k);
     }
 
@@ -148,6 +144,17 @@ public class WorldGenTrees extends WorldGenerator implements BlockSapling.TreeGe
                                 }
                             }
                         }
+
+                        if (random.nextInt(5) == 0 && l > 5) {
+                            for (j1 = 0; j1 < 2; ++j1) {
+                                for (k1 = 0; k1 < 4; ++k1) {
+                                    if (random.nextInt(4 - j1) == 0) {
+                                        i2 = random.nextInt(3);
+                                        this.setTypeAndData(world, i + Direction.a[Direction.e[k1]], j + l - 5 + j1, k + Direction.b[Direction.e[k1]], Block.COCOA.id, i2 << 2 | k1);
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     return true;