summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/bukkit/Material.java4
1 files changed, 2 insertions, 2 deletions
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 {