diff options
| author | md_5 <git@md-5.net> | 2018-07-18 09:45:27 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-07-18 09:45:27 +1000 |
| commit | 404d6e776e39f00f7466467600459189a6800870 (patch) | |
| tree | e74bbb529ac7a63bba5371c871e10f5491a80a7d /src | |
| parent | a3b5ef2c3e07c86184f265f9a649b8d04729c95a (diff) | |
| download | craftbukkit-404d6e776e39f00f7466467600459189a6800870.tar craftbukkit-404d6e776e39f00f7466467600459189a6800870.tar.gz craftbukkit-404d6e776e39f00f7466467600459189a6800870.tar.lz craftbukkit-404d6e776e39f00f7466467600459189a6800870.tar.xz craftbukkit-404d6e776e39f00f7466467600459189a6800870.zip | |
SPIGOT-4036: Handle regular/uncoloured shulker boxes
Diffstat (limited to 'src')
4 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index bfed2d98..3001cb44 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 e305d663..59d2685d 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 b044e382..d41459ef 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 2e44d133..81781339 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: |