OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4036: Handle regular/uncoloured shulker boxes

Browse source
This commit is contained in:
md_5 2018-07-18 09:45:27 +10:00
parent a3b5ef2c3e
commit 404d6e776e
4 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View file

@ -347,6 +347,7 @@ public class CraftBlock implements Block {
return new CraftBanner(this); return new CraftBanner(this);
case STRUCTURE_BLOCK: case STRUCTURE_BLOCK:
return new CraftStructureBlock(this); return new CraftStructureBlock(this);
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:

1
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
View file

@ -204,6 +204,7 @@ public final class CraftItemFactory implements ItemFactory {
case COMPARATOR: case COMPARATOR:
case SHIELD: case SHIELD:
case STRUCTURE_BLOCK: case STRUCTURE_BLOCK:
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:

1
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View file

@ -462,6 +462,7 @@ public final class CraftItemStack extends ItemStack {
case COMPARATOR: case COMPARATOR:
case SHIELD: case SHIELD:
case STRUCTURE_BLOCK: case STRUCTURE_BLOCK:
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View file

@ -186,6 +186,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case COMPARATOR: case COMPARATOR:
case SHIELD: case SHIELD:
case STRUCTURE_BLOCK: case STRUCTURE_BLOCK:
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:
@ -229,6 +230,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case SHIELD: case SHIELD:
blockEntityTag.setString("id", "banner"); blockEntityTag.setString("id", "banner");
break; break;
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:
@ -375,6 +377,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
te = new TileEntityStructure(); te = new TileEntityStructure();
} }
return new CraftStructureBlock(material, (TileEntityStructure) te); return new CraftStructureBlock(material, (TileEntityStructure) te);
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX:
@ -519,6 +522,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case STRUCTURE_BLOCK: case STRUCTURE_BLOCK:
valid = blockState instanceof CraftStructureBlock; valid = blockState instanceof CraftStructureBlock;
break; break;
case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX: case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX: case MAGENTA_SHULKER_BOX: