1 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/net/minecraft/server/ItemReed.java b/src/main/java/net/minecraft/server/ItemReed.java
index 49338122..d4bb4be7 100644
--- a/src/main/java/net/minecraft/server/ItemReed.java
+++ b/src/main/java/net/minecraft/server/ItemReed.java
@@ -9,11 +9,11 @@ import org.bukkit.event.block.BlockPlaceEvent;
 
 public class ItemReed extends Item {
 
-    private int a;
+    private int id;
 
     public ItemReed(int i, Block block) {
         super(i);
-        this.a = block.id;
+        this.id = block.id;
     }
 
     public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) {
@@ -50,33 +50,33 @@ public class ItemReed extends Item {
         if (itemstack.count == 0) {
             return false;
         } else {
-            if (world.a(this.a, i, j, k, false)) {
-                Block block = Block.byId[this.a];
+            if (world.a(this.id, i, j, k, false)) {
+                Block block = Block.byId[this.id];
 
                 // CraftBukkit start - This executes the placement of the block
                 BlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k); // CraftBukkit
                 /**
-                 * @see net.minecraft.server.World#e(int i, int j, int k, int l)
+                 * @see net.minecraft.server.World#setTypeId(int i, int j, int k, int l)
                  * 
-                 * This replaces world.e(IIII), we're doing this because we need to
+                 * This replaces world.setTypeId(IIII), we're doing this because we need to
                  * hook between the 'placement' and the informing to 'world' so we can
                  * sanely undo this.
                  *
-                 * Whenever the call to 'world.e' changes we need to figure out again what to
+                 * Whenever the call to 'world.setTypeId' changes we need to figure out again what to
                  * replace this with.
                  */
-                if (world.setTypeId(i, j, k, this.a)) { // <-- world.e does this to place the block
+                if (world.setRawTypeId(i, j, k, this.id)) { // <-- world.e does this to place the block
                     BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, replacedBlockState, clickedX, clickedY, clickedZ, block);
 
                     if (event.isCancelled() || !event.canBuild()) {
                         // CraftBukkit Undo -- this only has reed, repeater and pie blocks
                         world.setTypeIdAndData(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getRawData());
                     } else {
-                        world.f(i, j, k, a); // <-- world.e does this on success (tell the world)
+                        world.update(i, j, k, this.id); // <-- world.setTypeId does this on success (tell the world)
 
-                        Block.byId[this.a].d(world, i, j, k, l);
-                        Block.byId[this.a].a(world, i, j, k, (EntityLiving) entityhuman);
-                        world.a((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.c(), (block.stepSound.a() + 1.0F) / 2.0F, block.stepSound.b() * 0.8F);
+                        Block.byId[this.id].postPlace(world, i, j, k, l);
+                        Block.byId[this.id].postPlace(world, i, j, k, entityhuman);
+                        world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getName(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F);
                         --itemstack.count;
                     }
                     // CraftBukkit end