summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorPeter Olson <peter.olson@gmail.com>2013-12-03 21:33:30 -0800
committerNate Mortensen <nate.richard.mortensen@gmail.com>2013-12-16 19:48:17 -0700
commit1ac427113fe413437bf643eab941ccb4fd778232 (patch)
tree43fffe5c6dc5d18bff94cda46bf17d4cb4db3890 /src/main/java
parentecd5a027534fdcf42f68a3a4321792cd3bb51756 (diff)
downloadbukkit-1ac427113fe413437bf643eab941ccb4fd778232.tar
bukkit-1ac427113fe413437bf643eab941ccb4fd778232.tar.gz
bukkit-1ac427113fe413437bf643eab941ccb4fd778232.tar.lz
bukkit-1ac427113fe413437bf643eab941ccb4fd778232.tar.xz
bukkit-1ac427113fe413437bf643eab941ccb4fd778232.zip
Specify MaterialData for Acacia and Dark Oak stairs. Fixes BUKKIT-5037
When Minecraft 1.7 was released, Acacia and Dark Oak Stairs were added. While Bukkit added them to Material.java, it did not add the MaterialData mapping of them to Stairs.class. Currently getAscendingDirection() and other stair-specific functions can not be used on these new stairs. This commit fixes that by adding the mapping needed. Pulled from PR #977
Diffstat (limited to 'src/main/java')
-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 576d984c..13d2cb74 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -227,8 +227,8 @@ public enum Material {
STAINED_GLASS_PANE(160),
LEAVES_2(161),
LOG_2(162),
- ACACIA_STAIRS(163),
- DARK_OAK_STAIRS(164),
+ ACACIA_STAIRS(163, Stairs.class),
+ DARK_OAK_STAIRS(164, Stairs.class),
HAY_BLOCK(170),
CARPET(171),
HARD_CLAY(172),