1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/net/minecraft/server/BlockNetherWart.java b/src/main/java/net/minecraft/server/BlockNetherWart.java
index e90a5881..ea12b917 100644
--- a/src/main/java/net/minecraft/server/BlockNetherWart.java
+++ b/src/main/java/net/minecraft/server/BlockNetherWart.java
@@ -2,36 +2,36 @@ package net.minecraft.server;
 
 import java.util.Random;
 
-public class BlockNetherWart extends BlockFlower {
+public class BlockNetherWart extends BlockPlant {
 
-    protected BlockNetherWart(int i) {
-        super(i);
-        this.b(true);
+    protected BlockNetherWart() {
+        this.a(true);
         float f = 0.5F;
 
         this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.25F, 0.5F + f);
         this.a((CreativeModeTab) null);
     }
 
-    protected boolean g_(int i) {
-        return i == Block.SOUL_SAND.id;
+    protected boolean a(Block block) {
+        return block == Blocks.SOUL_SAND;
     }
 
-    public boolean f(World world, int i, int j, int k) {
-        return this.g_(world.getTypeId(i, j - 1, k));
+    public boolean j(World world, int i, int j, int k) {
+        return this.a(world.getType(i, j - 1, k));
     }
 
     public void a(World world, int i, int j, int k, Random random) {
         int l = world.getData(i, j, k);
 
         if (l < 3 && random.nextInt(10) == 0) {
-            org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
+            ++l;
+            org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this, l); // CraftBukkit
         }
 
         super.a(world, i, j, k, random);
     }
 
-    public int d() {
+    public int b() {
         return 6;
     }
 
@@ -47,13 +47,13 @@ public class BlockNetherWart extends BlockFlower {
             }
 
             for (int k1 = 0; k1 < j1; ++k1) {
-                this.b(world, i, j, k, new ItemStack(Item.NETHER_STALK));
+                this.a(world, i, j, k, new ItemStack(Items.NETHER_STALK));
             }
         }
     }
 
-    public int getDropType(int i, Random random, int j) {
-        return 0;
+    public Item getDropType(int i, Random random, int j) {
+        return null;
     }
 
     public int a(Random random) {