OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-12 09:51:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5943: Calling get BlockStateMeta#getBlockState causes NPE with shield with banner

Browse source
This commit is contained in:
md_5 2020-07-05 11:35:20 +10:00
parent 567e245fff
commit 4309566390
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,10 +268,12 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
@Override @Override
public BlockState getBlockState() { public BlockState getBlockState() {
Material stateMaterial = material; // Only actually used for jigsaws
if (blockEntityTag != null) { if (blockEntityTag != null) {
switch (material) { switch (material) {
case SHIELD: case SHIELD:
blockEntityTag.setString("id", "banner"); blockEntityTag.setString("id", "banner");
stateMaterial = shieldToBannerHack(blockEntityTag);
break; break;
case SHULKER_BOX: case SHULKER_BOX:
case WHITE_SHULKER_BOX: case WHITE_SHULKER_BOX:
@ -298,7 +300,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
break; break;
} }
} }
TileEntity te = (blockEntityTag == null) ? null : TileEntity.create(CraftMagicNumbers.getBlock(material).getBlockData(), blockEntityTag); TileEntity te = (blockEntityTag == null) ? null : TileEntity.create(CraftMagicNumbers.getBlock(stateMaterial).getBlockData(), blockEntityTag);
switch (material) { switch (material) {
case ACACIA_SIGN: case ACACIA_SIGN: