Commits

blablubbabc authored and md_5 committed 2c47af0cb05
SPIGOT-6963: CraftMetaBlockState#getBlockState applied TileEntity ids without the minecraft namespace prefix.

This was able to cause issues when ItemStacks are being compared.
No tags

src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java

Modified
211 211 public boolean hasBlockState() {
212 212 return blockEntityTag != null;
213 213 }
214 214
215 215 @Override
216 216 public BlockState getBlockState() {
217 217 Material stateMaterial = (material != Material.SHIELD) ? material : shieldToBannerHack(blockEntityTag); // Only actually used for jigsaws
218 218 if (blockEntityTag != null) {
219 219 switch (material) {
220 220 case SHIELD:
221 - blockEntityTag.putString("id", "banner");
221 + blockEntityTag.putString("id", "minecraft:banner");
222 222 break;
223 223 case SHULKER_BOX:
224 224 case WHITE_SHULKER_BOX:
225 225 case ORANGE_SHULKER_BOX:
226 226 case MAGENTA_SHULKER_BOX:
227 227 case LIGHT_BLUE_SHULKER_BOX:
228 228 case YELLOW_SHULKER_BOX:
229 229 case LIME_SHULKER_BOX:
230 230 case PINK_SHULKER_BOX:
231 231 case GRAY_SHULKER_BOX:
232 232 case LIGHT_GRAY_SHULKER_BOX:
233 233 case CYAN_SHULKER_BOX:
234 234 case PURPLE_SHULKER_BOX:
235 235 case BLUE_SHULKER_BOX:
236 236 case BROWN_SHULKER_BOX:
237 237 case GREEN_SHULKER_BOX:
238 238 case RED_SHULKER_BOX:
239 239 case BLACK_SHULKER_BOX:
240 - blockEntityTag.putString("id", "shulker_box");
240 + blockEntityTag.putString("id", "minecraft:shulker_box");
241 241 break;
242 242 case BEE_NEST:
243 243 case BEEHIVE:
244 - blockEntityTag.putString("id", "beehive");
244 + blockEntityTag.putString("id", "minecraft:beehive");
245 245 break;
246 246 }
247 247 }
248 248
249 249 // This is expected to always return a CraftBlockEntityState for the passed material:
250 250 return CraftBlockStates.getBlockState(stateMaterial, blockEntityTag);
251 251 }
252 252
253 253 @Override
254 254 public void setBlockState(BlockState blockState) {

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut