summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-09-28 15:00:02 -0500
committerTravis Watkins <amaranth@ubuntu.com>2012-09-28 15:00:02 -0500
commit62a9b8815bc16971c2ea61f89f0f4d11f99a64ed (patch)
tree0dcfc5c7387e861ac254a6043d28a4929c252d6e /src/main/java
parentb5580b6d95f025d72c117ebd28082c12c1c7a77c (diff)
downloadcraftbukkit-62a9b8815bc16971c2ea61f89f0f4d11f99a64ed.tar
craftbukkit-62a9b8815bc16971c2ea61f89f0f4d11f99a64ed.tar.gz
craftbukkit-62a9b8815bc16971c2ea61f89f0f4d11f99a64ed.tar.lz
craftbukkit-62a9b8815bc16971c2ea61f89f0f4d11f99a64ed.tar.xz
craftbukkit-62a9b8815bc16971c2ea61f89f0f4d11f99a64ed.zip
Allow data values on mushroom and mob spawner blocks. Fixes BUKKIT-2346
In 1.2.5 and older versions of CraftBukkit we allowed the use of data values on bug mushroom and mob spawner blocks for use with plugins. For the 1.3 update the mechanism for doing this was changed and I accidentally used the wrong value when adding these, indicating that they should not have data instead of our actual intent. This change corrects this regression.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/Block.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 290af479..d5880a4b 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -653,9 +653,11 @@ public class Block {
Item.byId[WATER_LILY.id] = new ItemWaterLily(WATER_LILY.id - 256);
Item.byId[PISTON.id] = new ItemPiston(PISTON.id - 256);
Item.byId[PISTON_STICKY.id] = new ItemPiston(PISTON_STICKY.id - 256);
- Item.byId[BIG_MUSHROOM_1.id] = new ItemWithAuxData(BIG_MUSHROOM_1.id - 256, false); // CraftBukkit
- Item.byId[BIG_MUSHROOM_2.id] = new ItemWithAuxData(BIG_MUSHROOM_2.id - 256, false); // CraftBukkit
- Item.byId[MOB_SPAWNER.id] = new ItemWithAuxData(MOB_SPAWNER.id - 256, false); // CraftBukkit
+ // CraftBukkit start
+ Item.byId[BIG_MUSHROOM_1.id] = new ItemWithAuxData(BIG_MUSHROOM_1.id - 256, true);
+ Item.byId[BIG_MUSHROOM_2.id] = new ItemWithAuxData(BIG_MUSHROOM_2.id - 256, true);
+ Item.byId[MOB_SPAWNER.id] = new ItemWithAuxData(MOB_SPAWNER.id - 256, true);
+ // CraftBukkit end
for (int i = 0; i < 256; ++i) {
if (byId[i] != null) {