From 2bed49c0fe15a61592742eb5c8ec58c893d23e9a Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Sun, 25 Sep 2011 03:05:07 +0100
Subject: Fixed Material.getData returning for "dull" materials with no fancy
 dataclass

---
 src/main/java/org/bukkit/Material.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 3baf2b6e..b316cd52 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -306,7 +306,7 @@ public enum Material {
      * @return MaterialData associated with this Material
      */
     public Class<? extends MaterialData> getData() {
-        return data;
+        return (data == null) ? MaterialData.class : data;
     }
 
     /**
@@ -318,7 +318,7 @@ public enum Material {
      */
     public MaterialData getNewData(final byte raw) {
         if (data == null) {
-            return null;
+            return new MaterialData(id, raw);
         }
 
         try {
-- 
cgit v1.2.3