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, 5 insertions, 6 deletions

diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
index 27762345..38f839a9 100644
--- a/src/main/java/net/minecraft/server/BlockGrass.java
+++ b/src/main/java/net/minecraft/server/BlockGrass.java
@@ -21,9 +21,8 @@ public class BlockGrass extends Block {
 
     public void a(World world, int i, int j, int k, Random random) {
         if (!world.isStatic) {
-            // CraftBukkit start - reuse getLightLevel
-            int lightLevel = world.getLightLevel(i, j + 1, k);
-            if (lightLevel < 4 && Block.q[world.getTypeId(i, j + 1, k)] > 2) {
+            if (world.getLightLevel(i, j + 1, k) < 4 && Block.lightBlock[world.getTypeId(i, j + 1, k)] > 2) {
+                // CraftBukkit start - reuse getLightLevel
                 org.bukkit.World bworld = world.getWorld();
                 org.bukkit.block.BlockState blockState = bworld.getBlockAt(i, j, k).getState();
                 blockState.setTypeId(Block.DIRT.id);
@@ -34,15 +33,15 @@ public class BlockGrass extends Block {
                 if (!event.isCancelled()) {
                     blockState.update(true);
                 }
-            } else if (lightLevel >= 9) {
-            // CraftBukkit end
+                // CraftBukkit end
+            } else if (world.getLightLevel(i, j + 1, k) >= 9) {
                 for (int l = 0; l < 4; ++l) {
                     int i1 = i + random.nextInt(3) - 1;
                     int j1 = j + random.nextInt(5) - 3;
                     int k1 = k + random.nextInt(3) - 1;
                     int l1 = world.getTypeId(i1, j1 + 1, k1);
 
-                    if (world.getTypeId(i1, j1, k1) == Block.DIRT.id && world.getLightLevel(i1, j1 + 1, k1) >= 4 && Block.q[l1] <= 2) {
+                    if (world.getTypeId(i1, j1, k1) == Block.DIRT.id && world.getLightLevel(i1, j1 + 1, k1) >= 4 && Block.lightBlock[l1] <= 2) {
                         // CraftBukkit start
                         org.bukkit.World bworld = world.getWorld();
                         org.bukkit.block.BlockState blockState = bworld.getBlockAt(i1, j1, k1).getState();