diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
new file mode 100644
index 0000000000..1c27571a79
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -0,0 +1,359 @@
+package net.minecraft.server;
+
+import java.util.ArrayList;
+
+// CraftBukkit start
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+// CraftBukkit end
+
+public class BlockPiston extends Block {
+
+    private boolean a;
+    private boolean b;
+
+    public BlockPiston(int i, int j, boolean flag) {
+        super(i, j, Material.PISTON);
+        this.a = flag;
+        this.a(h);
+        this.c(0.5F);
+    }
+
+    public int a(int i, int j) {
+        int k = c(j);
+
+        return k > 5 ? this.textureId : (i == k ? (!d(j) && this.minX <= 0.0D && this.minY <= 0.0D && this.minZ <= 0.0D && this.maxX >= 1.0D && this.maxY >= 1.0D && this.maxZ >= 1.0D ? this.textureId : 110) : (i == PistonBlockTextures.a[k] ? 109 : 108));
+    }
+
+    public boolean a() {
+        return false;
+    }
+
+    public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) {
+        return false;
+    }
+
+    public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) {
+        int l = c(world, i, j, k, (EntityHuman) entityliving);
+
+        world.setData(i, j, k, l);
+        if (!world.isStatic) {
+            this.g(world, i, j, k);
+        }
+    }
+
+    public void doPhysics(World world, int i, int j, int k, int l) {
+        if (!world.isStatic && !this.b) {
+            this.g(world, i, j, k);
+        }
+    }
+
+    public void c(World world, int i, int j, int k) {
+        if (!world.isStatic && world.getTileEntity(i, j, k) == null) {
+            this.g(world, i, j, k);
+        }
+    }
+
+    private void g(World world, int i, int j, int k) {
+        int l = world.getData(i, j, k);
+        int i1 = c(l);
+        boolean flag = this.f(world, i, j, k, i1);
+
+        if (l != 7) {
+            if (flag && !d(l)) {
+                // CraftBukkit start
+                int length = h(world, i, j, k, i1);
+                if (length >= 0) {
+                    org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
+
+                    BlockPistonExtendEvent event = new BlockPistonExtendEvent(block, length);
+                    world.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return;
+                    }
+                    // CraftBukkit end
+
+                    world.setRawData(i, j, k, i1 | 8);
+                    world.playNote(i, j, k, 0, i1);
+                }
+            } else if (!flag && d(l)) {
+                // CraftBukkit start
+                org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
+
+                BlockPistonRetractEvent event = new BlockPistonRetractEvent(block);
+                world.getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return;
+                }
+                // CraftBukkit end
+
+                world.setRawData(i, j, k, i1);
+                world.playNote(i, j, k, 1, i1);
+            }
+        }
+    }
+
+    private boolean f(World world, int i, int j, int k, int l) {
+        return l != 0 && world.isBlockFaceIndirectlyPowered(i, j - 1, k, 0) ? true : (l != 1 && world.isBlockFaceIndirectlyPowered(i, j + 1, k, 1) ? true : (l != 2 && world.isBlockFaceIndirectlyPowered(i, j, k - 1, 2) ? true : (l != 3 && world.isBlockFaceIndirectlyPowered(i, j, k + 1, 3) ? true : (l != 5 && world.isBlockFaceIndirectlyPowered(i + 1, j, k, 5) ? true : (l != 4 && world.isBlockFaceIndirectlyPowered(i - 1, j, k, 4) ? true : (world.isBlockFaceIndirectlyPowered(i, j, k, 0) ? true : (world.isBlockFaceIndirectlyPowered(i, j + 2, k, 1) ? true : (world.isBlockFaceIndirectlyPowered(i, j + 1, k - 1, 2) ? true : (world.isBlockFaceIndirectlyPowered(i, j + 1, k + 1, 3) ? true : (world.isBlockFaceIndirectlyPowered(i - 1, j + 1, k, 4) ? true : world.isBlockFaceIndirectlyPowered(i + 1, j + 1, k, 5)))))))))));
+    }
+
+    public void a(World world, int i, int j, int k, int l, int i1) {
+        this.b = true;
+        if (l == 0) {
+            if (this.i(world, i, j, k, i1)) {
+                world.setData(i, j, k, i1 | 8);
+                world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "tile.piston.out", 0.5F, world.random.nextFloat() * 0.25F + 0.6F);
+            }
+        } else if (l == 1) {
+            TileEntity tileentity = world.getTileEntity(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1]);
+
+            if (tileentity != null && tileentity instanceof TileEntityPiston) {
+                ((TileEntityPiston) tileentity).k();
+            }
+
+            world.setRawTypeIdAndData(i, j, k, Block.PISTON_MOVING.id, i1);
+            world.setTileEntity(i, j, k, BlockPistonMoving.a(this.id, i1, i1, false, true));
+            if (this.a) {
+                int j1 = i + PistonBlockTextures.b[i1] * 2;
+                int k1 = j + PistonBlockTextures.c[i1] * 2;
+                int l1 = k + PistonBlockTextures.d[i1] * 2;
+                int i2 = world.getTypeId(j1, k1, l1);
+                int j2 = world.getData(j1, k1, l1);
+                boolean flag = false;
+
+                if (i2 == Block.PISTON_MOVING.id) {
+                    TileEntity tileentity1 = world.getTileEntity(j1, k1, l1);
+
+                    if (tileentity1 != null && tileentity1 instanceof TileEntityPiston) {
+                        TileEntityPiston tileentitypiston = (TileEntityPiston) tileentity1;
+
+                        if (tileentitypiston.d() == i1 && tileentitypiston.c()) {
+                            tileentitypiston.k();
+                            i2 = tileentitypiston.a();
+                            j2 = tileentitypiston.e();
+                            flag = true;
+                        }
+                    }
+                }
+
+                if (!flag && i2 > 0 && a(i2, world, j1, k1, l1, false) && (Block.byId[i2].e() == 0 || i2 == Block.PISTON.id || i2 == Block.PISTON_STICKY.id)) {
+                    this.b = false;
+                    world.setTypeId(j1, k1, l1, 0);
+                    this.b = true;
+                    i += PistonBlockTextures.b[i1];
+                    j += PistonBlockTextures.c[i1];
+                    k += PistonBlockTextures.d[i1];
+                    world.setRawTypeIdAndData(i, j, k, Block.PISTON_MOVING.id, j2);
+                    world.setTileEntity(i, j, k, BlockPistonMoving.a(i2, j2, i1, false, false));
+                } else if (!flag) {
+                    this.b = false;
+                    world.setTypeId(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1], 0);
+                    this.b = true;
+                }
+            } else {
+                this.b = false;
+                world.setTypeId(i + PistonBlockTextures.b[i1], j + PistonBlockTextures.c[i1], k + PistonBlockTextures.d[i1], 0);
+                this.b = true;
+            }
+
+            world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "tile.piston.in", 0.5F, world.random.nextFloat() * 0.15F + 0.6F);
+        }
+
+        this.b = false;
+    }
+
+    public void a(IBlockAccess iblockaccess, int i, int j, int k) {
+        int l = iblockaccess.getData(i, j, k);
+
+        if (d(l)) {
+            switch (c(l)) {
+            case 0:
+                this.a(0.0F, 0.25F, 0.0F, 1.0F, 1.0F, 1.0F);
+                break;
+
+            case 1:
+                this.a(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F);
+                break;
+
+            case 2:
+                this.a(0.0F, 0.0F, 0.25F, 1.0F, 1.0F, 1.0F);
+                break;
+
+            case 3:
+                this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.75F);
+                break;
+
+            case 4:
+                this.a(0.25F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+                break;
+
+            case 5:
+                this.a(0.0F, 0.0F, 0.0F, 0.75F, 1.0F, 1.0F);
+            }
+        } else {
+            this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        }
+    }
+
+    public void a(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) {
+        this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+        super.a(world, i, j, k, axisalignedbb, arraylist);
+    }
+
+    public boolean b() {
+        return false;
+    }
+
+    public static int c(int i) {
+        return i & 7;
+    }
+
+    public static boolean d(int i) {
+        return (i & 8) != 0;
+    }
+
+    private static int c(World world, int i, int j, int k, EntityHuman entityhuman) {
+        if (MathHelper.abs((float) entityhuman.locX - (float) i) < 2.0F && MathHelper.abs((float) entityhuman.locZ - (float) k) < 2.0F) {
+            double d0 = entityhuman.locY + 1.82D - (double) entityhuman.height;
+
+            if (d0 - (double) j > 2.0D) {
+                return 1;
+            }
+
+            if ((double) j - d0 > 0.0D) {
+                return 0;
+            }
+        }
+
+        int l = MathHelper.floor((double) (entityhuman.yaw * 4.0F / 360.0F) + 0.5D) & 3;
+
+        return l == 0 ? 2 : (l == 1 ? 5 : (l == 2 ? 3 : (l == 3 ? 4 : 0)));
+    }
+
+    private static boolean a(int i, World world, int j, int k, int l, boolean flag) {
+        if (i == Block.OBSIDIAN.id) {
+            return false;
+        } else {
+            if (i != Block.PISTON.id && i != Block.PISTON_STICKY.id) {
+                if (Block.byId[i].j() == -1.0F) {
+                    return false;
+                }
+
+                if (Block.byId[i].e() == 2) {
+                    return false;
+                }
+
+                if (!flag && Block.byId[i].e() == 1) {
+                    return false;
+                }
+            } else if (d(world.getData(j, k, l))) {
+                return false;
+            }
+
+            TileEntity tileentity = world.getTileEntity(j, k, l);
+
+            return tileentity == null;
+        }
+    }
+
+    // CraftBukkkit boolean -> int
+    private static int h(World world, int i, int j, int k, int l) {
+        int i1 = i + PistonBlockTextures.b[l];
+        int j1 = j + PistonBlockTextures.c[l];
+        int k1 = k + PistonBlockTextures.d[l];
+        int l1 = 0;
+
+        while (true) {
+            if (l1 < 13) {
+                if (j1 <= 0 || j1 >= 127) {
+                    return -1; // CraftBukkit
+                }
+
+                int i2 = world.getTypeId(i1, j1, k1);
+
+                if (i2 != 0) {
+                    if (!a(i2, world, i1, j1, k1, true)) {
+                        return -1; // CraftBukkit
+                    }
+
+                    if (Block.byId[i2].e() != 1) {
+                        if (l1 == 12) {
+                            return -1; // CraftBukkit
+                        }
+
+                        i1 += PistonBlockTextures.b[l];
+                        j1 += PistonBlockTextures.c[l];
+                        k1 += PistonBlockTextures.d[l];
+                        ++l1;
+                        continue;
+                    }
+                }
+            }
+
+            return l1; // CraftBukkit
+        }
+    }
+
+    private boolean i(World world, int i, int j, int k, int l) {
+        int i1 = i + PistonBlockTextures.b[l];
+        int j1 = j + PistonBlockTextures.c[l];
+        int k1 = k + PistonBlockTextures.d[l];
+        int l1 = 0;
+
+        while (true) {
+            int i2;
+
+            if (l1 < 13) {
+                if (j1 <= 0 || j1 >= 127) {
+                    return false;
+                }
+
+                i2 = world.getTypeId(i1, j1, k1);
+                if (i2 != 0) {
+                    if (!a(i2, world, i1, j1, k1, true)) {
+                        return false;
+                    }
+
+                    if (Block.byId[i2].e() != 1) {
+                        if (l1 == 12) {
+                            return false;
+                        }
+
+                        i1 += PistonBlockTextures.b[l];
+                        j1 += PistonBlockTextures.c[l];
+                        k1 += PistonBlockTextures.d[l];
+                        ++l1;
+                        continue;
+                    }
+
+                    Block.byId[i2].g(world, i1, j1, k1, world.getData(i1, j1, k1));
+                    world.setTypeId(i1, j1, k1, 0);
+                }
+            }
+
+            while (i1 != i || j1 != j || k1 != k) {
+                l1 = i1 - PistonBlockTextures.b[l];
+                i2 = j1 - PistonBlockTextures.c[l];
+                int j2 = k1 - PistonBlockTextures.d[l];
+                int k2 = world.getTypeId(l1, i2, j2);
+                int l2 = world.getData(l1, i2, j2);
+
+                if (k2 == this.id && l1 == i && i2 == j && j2 == k) {
+                    world.setRawTypeIdAndData(i1, j1, k1, Block.PISTON_MOVING.id, l | (this.a ? 8 : 0));
+                    world.setTileEntity(i1, j1, k1, BlockPistonMoving.a(Block.PISTON_EXTENSION.id, l | (this.a ? 8 : 0), l, true, false));
+                } else {
+                    world.setRawTypeIdAndData(i1, j1, k1, Block.PISTON_MOVING.id, l2);
+                    world.setTileEntity(i1, j1, k1, BlockPistonMoving.a(k2, l2, l, true, false));
+                }
+
+                i1 = l1;
+                j1 = i2;
+                k1 = j2;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 5835a6f387..2faffdf5f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
+import org.bukkit.block.PistonMoveReaction;
 
 import net.minecraft.server.BiomeBase;
 import net.minecraft.server.BlockRedstoneWire;
@@ -222,7 +223,11 @@ public class CraftBlock implements Block {
      * @return Block at the given offsets
      */
     public Block getRelative(BlockFace face) {
-        return getRelative(face.getModX(), face.getModY(), face.getModZ());
+        return getRelative(face, 1);
+    }
+
+    public Block getRelative(BlockFace face, int distance) {
+        return getRelative(face.getModX() * distance, face.getModY() * distance, face.getModZ() * distance);
     }
 
     /**
@@ -418,4 +423,9 @@ public class CraftBlock implements Block {
     public boolean isLiquid() {
         return (getType() == Material.WATER) || (getType() == Material.STATIONARY_WATER) || (getType() == Material.LAVA) || (getType() == Material.STATIONARY_LAVA);
     }
+
+    public PistonMoveReaction getPistonMoveReaction() {
+        return PistonMoveReaction.getById(net.minecraft.server.Block.byId[this.getTypeId()].material.j());
+
+    }
 }