Fixed Material

1 files changed, 20 insertions, 2 deletions

diff --git a/src/org/bukkit/craftbukkit/CraftBlock.java b/src/org/bukkit/craftbukkit/CraftBlock.java
index 351f4a7b..f67d14bf 100644
--- a/src/org/bukkit/craftbukkit/CraftBlock.java
+++ b/src/org/bukkit/craftbukkit/CraftBlock.java
@@ -87,21 +87,39 @@ public class CraftBlock implements Block {
     }
 
     /**
+     * Sets the type of this block
+     *
+     * @param type Material to change this block to
+     */
+    public void setType(final Material type) {
+        setTypeID(type.getID());
+    }
+
+    /**
      * Sets the type-ID of this block
      *
      * @param type Type-ID to change this block to
      */
-    public void setType(final int type) {
+    public void setTypeID(final int type) {
         this.type = type;
         world.getHandle().d(x, y, z, type);
     }
 
     /**
+     * Gets the type of this block
+     *
+     * @return block type
+     */
+    public Material getType() {
+        return Material.getMaterial(getTypeID());
+    }
+
+    /**
      * Gets the type-ID of this block
      *
      * @return block type-ID
      */
-    public int getType() {
+    public int getTypeID() {
         return type;
     }