From 404d6e776e39f00f7466467600459189a6800870 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Jul 2018 09:45:27 +1000 Subject: [PATCH] SPIGOT-4036: Handle regular/uncoloured shulker boxes --- src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | 1 + .../org/bukkit/craftbukkit/inventory/CraftItemFactory.java | 1 + .../java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 1 + .../org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index bfed2d988a..3001cb44c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -347,6 +347,7 @@ public class CraftBlock implements Block { return new CraftBanner(this); case STRUCTURE_BLOCK: return new CraftStructureBlock(this); + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index e305d663aa..59d2685dc8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -204,6 +204,7 @@ public final class CraftItemFactory implements ItemFactory { case COMPARATOR: case SHIELD: case STRUCTURE_BLOCK: + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index b044e38206..d41459ef01 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -462,6 +462,7 @@ public final class CraftItemStack extends ItemStack { case COMPARATOR: case SHIELD: case STRUCTURE_BLOCK: + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java index 2e44d13304..817813390e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -186,6 +186,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case COMPARATOR: case SHIELD: case STRUCTURE_BLOCK: + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: @@ -229,6 +230,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case SHIELD: blockEntityTag.setString("id", "banner"); break; + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: @@ -375,6 +377,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta te = new TileEntityStructure(); } return new CraftStructureBlock(material, (TileEntityStructure) te); + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: @@ -519,6 +522,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta case STRUCTURE_BLOCK: valid = blockState instanceof CraftStructureBlock; break; + case SHULKER_BOX: case WHITE_SHULKER_BOX: case ORANGE_SHULKER_BOX: case MAGENTA_SHULKER_BOX: