diff options
| author | md_5 <git@md-5.net> | 2017-07-16 10:48:21 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-07-16 10:48:21 +1000 |
| commit | b5df1f59f7cf4027707f200e781977c4d44768b4 (patch) | |
| tree | c05fae1e4f906056c9718b50600cc3812eeedc80 | |
| parent | e03b1a556d889f5ad47d53a4157bde75cbbf4764 (diff) | |
| download | craftbukkit-b5df1f59f7cf4027707f200e781977c4d44768b4.tar craftbukkit-b5df1f59f7cf4027707f200e781977c4d44768b4.tar.gz craftbukkit-b5df1f59f7cf4027707f200e781977c4d44768b4.tar.lz craftbukkit-b5df1f59f7cf4027707f200e781977c4d44768b4.tar.xz craftbukkit-b5df1f59f7cf4027707f200e781977c4d44768b4.zip | |
SPIGOT-3423: Don't treat technical piston block as BlockStateMeta
3 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index fe85d6a2..49ebad22 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -105,7 +105,6 @@ public final class CraftItemFactory implements ItemFactory { case SIGN: case MOB_SPAWNER: case NOTE_BLOCK: - case PISTON_BASE: case BREWING_STAND_ITEM: case ENCHANTMENT_TABLE: case COMMAND: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index 3f11e427..fb1dc542 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -364,7 +364,6 @@ public final class CraftItemStack extends ItemStack { case SIGN: case MOB_SPAWNER: case NOTE_BLOCK: - case PISTON_BASE: case BREWING_STAND_ITEM: case ENCHANTMENT_TABLE: case COMMAND: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java index 8896bd46..436e8d04 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -178,7 +178,6 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case SIGN: case MOB_SPAWNER: case NOTE_BLOCK: - case PISTON_BASE: case BREWING_STAND_ITEM: case ENCHANTMENT_TABLE: case COMMAND: @@ -384,6 +383,8 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta te = new TileEntityComparator(); } return new CraftComparator(material, (TileEntityComparator) te); + case PISTON_BASE: + default: throw new IllegalStateException("Missing blockState for " + material); } |