Update for 1.1_01 renames.

We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
index 06d73ed2..7b3d7739 100644
--- a/src/main/java/net/minecraft/server/BlockSapling.java
+++ b/src/main/java/net/minecraft/server/BlockSapling.java
@@ -29,7 +29,7 @@ public class BlockSapling extends BlockFlower {
                 if ((l & 8) == 0) {
                     world.setData(i, j, k, l | 8);
                 } else {
-                    this.b(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
+                    this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
                 }
             }
         }
@@ -41,11 +41,10 @@ public class BlockSapling extends BlockFlower {
     }
 
     // CraftBukkit - added bonemeal, player and itemstack
-    public void b(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) {
+    public void grow(World world, int i, int j, int k, Random random, boolean bonemeal, Player player, ItemStack itemstack) {
         int l = world.getData(i, j, k) & 3;
 
         world.setRawTypeId(i, j, k, 0);
-
         // CraftBukkit start - fixes client updates on recently grown trees
         boolean grownTree;
         BlockChangeWithNotify delegate = new BlockChangeWithNotify(world);
@@ -74,9 +73,9 @@ public class BlockSapling extends BlockFlower {
             --itemstack.count;
         }
         if (!grownTree || event.isCancelled()) {
+            // CraftBukkit end
             world.setRawTypeIdAndData(i, j, k, this.id, l);
         }
-        // CraftBukkit end
     }
 
     protected int getDropData(int i) {